Log4j Test
Merge branch 'master' of https://github.com/megaerki/atarkvara/

Conflicts:
	POS/version.properties