Mergu branche
Merge branch 'master' of https://github.com/Osebek/IPRI_project

Conflicts:
	app/partials/browse.htmlMergu brancheMerge branch 'master' of https://github.com/Osebek/IPRI_project

Conflicts:
	app/partials/browse.html