B2 txt added in dev
B2 editted in dev
B2 editted in dev
B2 txt added in dev
B2 editted in dev
B2 editted in dev
Merge branch 'dev' of https://github.com/alhenk/ff into dev
B2 txt added in dev
B2 editted in dev
B2 editted in dev
B2 editted in dev
B2 editted in dev
b2 conflect solved
Merge branch 'dev'