silly bug
merge error
typo
Merge branch 'develop' of https://github.com/ImaginationForPeople/assembl into feature/confirmemail