komit
Merge branch 'devel' of https://github.com/jvaclavovic/test into devel

Conflicts:
	src/zdrojak.sql