Merge branch 'develop'
Merge branch 'develop'
Merge remote-tracking branch 'upstream/develop' into feature/project-sheet
Project sheet WIP
Merge branch 'develop' of https://github.com/ImaginationForPeople/imaginationforpeople into feature/project-sheet
Project Sheet WIP
merged fan and member list
Merge pull request #1 from freddylimpens/feature/project-sheet

merged fan and member list
Project Sheet WIP
Merge branch 'feature/project-sheet' of github.com:mghilaci/imaginationforpeople into feature/project-sheet
do not show duplicate users (when one is both fan and team member)
include fans in team pop up
Project sheet WIP
Merge pull request #2 from freddylimpens/feature/project-sheet

do not show duplicate users (when one is both fan and team member)
Merge branch 'feature/project-sheet' of github.com:mghilaci/imaginationforpeople into feature/project-sheet
Project sheet WIP
Project Sheet WIP
Merge branch 'feature/project-sheet' of https://github.com/mghilaci/imaginationforpeople into mghilaci-feature/project-sheet
Support SEO fields properly for CMS pages
Merge branch 'hotfix/cms_seo_fields_support'