updated requirements
Merge branch 'develop'
Merge branch 'master' of https://github.com/ImaginationForPeople/assembl into develop
To do a two-way merge