Log4j config file is in /etc in jar and added property to load from it
Merge branch 'master' of https://github.com/IHallik/-include--name-.git

Conflicts:
	POS/application.properties
	POS/version.properties