Merge branch 'master' of https://github.com/salex1980/kefirchik

Conflicts:
	pom.xml