wip
Merge branch 'master' of https://github.com/cicadas-2014/Embark
Merge branch 'master' of https://github.com/cicadas-2014/Embark
wip
Merge branch 'master' of https://github.com/cicadas-2014/Embark
updated login forms
Merge pull request #158 from LasseSviland/master

updated login forms
Merge branch 'master' of https://github.com/cicadas-2014/Embark
delete compass from description page
updated user page
Merge pull request #159 from DineshRai/bug_fix_loading_gif

Bug fix loading gif
Merge branch 'master' of https://github.com/cicadas-2014/Embark
put back nav bar userpage
Merge pull request #160 from LasseSviland/master

updated user page
Merge branch 'master' of https://github.com/cicadas-2014/Embark