functions became relations
Merge branch 'develop' of https://github.com/ImaginationForPeople/assembl into feature/confirmemail
this should hold