step 0: never redirect back to login
Merge branch 'develop' of https://github.com/ImaginationForPeople/assembl into develop