Fixig routes
Ordering group recommendation
Merge branch 'group_recommendation' into develop

Conflicts:
	app/assets/stylesheets/users.css.scss
Resolve conflict in user css file