Merge branch 'develop' into ruben
Backend work
Merge branch 'ruben' into develop
Merge branch 'develop' of https://github.com/hashie5/app into develop
Merge branch 'develop' into ruben
Frontend work
Merge branch 'ruben' into develop
Frontend work
Merge branch 'ruben' into develop
Menu
Update menu
Merge branch 'menu' into ruben
Fix menu active item
Frontend work
Update frontend
Update frontend
Merge branch 'ruben' into develop
Update backend
Merge branch 'ruben' of https://github.com/hashie5/app into dennis
update frontend