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

Conflicts:
	application.properties
Merge branch 'master' of https://github.com/pohh-mell/BeerHousePOS

Conflicts:
	application.properties
katse
katse 2