#7 android app
poceo neke forme
Merge branch 'master' of https://github.com/SoftLab-IS/budimoljudi

Conflicts:
	.idea/workspace.xml
permisije akcija
Merge branch 'master' of https://github.com/SoftLab-IS/budimoljudi

Conflicts:
	.gitignore
	protected/controllers/SiteController.php
test
Merge branch 'master' of https://github.com/SoftLab-IS/budimoljudi

Conflicts:
	.gitignore