Removing temporary hack
Merge branch 'develop' of github.com:ImaginationForPeople/assembl into develop

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