a
a
Merge branch 'master' of https://github.com/jankme/tarkvaratehnika.git

Conflicts:
	version.properties
uus build fail