more
profilePage_etc
Merge branch 'master' of https://github.com/1u/hmmm into menu_route

Conflicts:
	client/views/courses/course.list.js