hotfix
Merge branch '1.0_br' - bugfix

Conflicts:
	dev_src/plik1.txt