Predavanja UI done
Merge branch 'master' of https://github.com/milosjovac/elfakHakaton

Conflicts:
	Android/hakatonApp/src/com/example/hakatonapp/activities/LoginActivity.java