rocni merge, dela vse razen activitystrema
merge koncan, dela vse
Kozmeticni popravki - navbar, userprofile
Merge pull request #85 from aOberstar/master

Kozmetični popravki
merge chata
Merge pull request #87 from aOberstar/master

Merge chata
Merge pull request #23 from ipri2013/master

Sync preostalih stvari