hot fix
Merge branch '1.2_br'

Conflicts:
	dev_src/plik1.txt