Added user handling to navbar
Merge branch 'new-design-for-2014' of https://github.com/mogelbrod/studs into new-design-for-2014

Merge two branches