Logimine
Merge branch 'master' of https://github.com/timo-piirmann/umbluu.git

Conflicts:
	POS/version.properties
Merge branch 'master' of https://github.com/timo-piirmann/umbluu.git
Logimine