Cleanup
Updated frontend for mongo data
Increase number of courses returned
Merge branch 'master' into app_update

Conflicts:
	client/scripts/Courses/CoursesCtrl.coffee