merge
Merge branch 'master' of https://github.com/askaza/kma

Conflicts:
	source/User-komments.jpg
	source/User-voprosy.jpg
bugfix