UI card progress
Merge branch 'master' of https://github.com/milosjovac/elfakHakaton

Conflicts:
	Android/hakatonApp/project.properties