s
Merge branch 'master' of https://github.com/stenno12/KiisuV2lk.git

Conflicts:
	POS/src/application.properties
	POS/src/log4j.properties
	POS/src/version.properties
POS extended