Merge branch 'profile-page' of github.com:Simon245/grasshopper into Simon245-profile-page

RESOLVED conflicts in	app/views/site/index.html.slim
Merge branch 'master' into angular