Merge
Merge branch 'master' of https://github.com/twardakm/obraz

Conflicts:
	CMakeLists.txt.user