notification: fix bug displaying
fix bug ideaList
group: move add group function to header
Merge branch 'marionette' of github.com:ImaginationForPeople/assembl into marionette
Merge branch 'marionette' of github.com:ImaginationForPeople/assembl into marionette

Conflicts:
	assembl/static/js/app/modules/routeManager.js
Merge branch 'marionette' of github.com:ImaginationForPeople/assembl into marionette

Conflicts:
	assembl/static/js/app/modules/routeManager.js
Merge branch 'marionette' of github.com:ImaginationForPeople/assembl into marionette

Conflicts:
	assembl/static/js/app/modules/routeManager.js
Merge branch 'marionette' of github.com:ImaginationForPeople/assembl into marionette

Conflicts:
	assembl/static/js/app/modules/routeManager.js