test

test
Merge branch 'master' of https://github.com/tuksiarz/Krachapp

Conflicts:
	.gradle/1.12/taskArtifacts/cache.properties.lock