komit
Merge branch 'master' of https://github.com/fancystudio/vlasy

Conflicts:
	config/xml/blog-sk.xml