mergecommit
Merge branch 'master' of https://github.com/pohh-mell/BeerHousePOS

Conflicts:
	config/version.properties