Merge branch 'feature/newgroups' into develop
Merge branch 'develop' of https://github.com/ImaginationForPeople/imaginationforpeople into develop
Adding slug to group fields, permitting to view group details with slug and adding thumbnail of group images to the API
Merge branch 'hotfix/fix_zh_locale'
Merge branch 'release/barrett'
Merge branch 'master' of github.com:ImaginationForPeople/imaginationforpeople
Merge remote-tracking branch 'upstream/master'
fixed a remaining direct ref to i4pTranslation no longer working with hvad
Merge branch 'hotfix/project_translation_not_iterable' into develop
Merge branch 'develop' of https://github.com/ImaginationForPeople/imaginationforpeople into develop
remaining ref to old i4pTranslation object
Merge branch 'hotfix/i4p_translation_not_iterable'
Merge branch 'hotfix/i4p_translation_not_iterable' into develop
Merge pull request #101 from cglapa/develop

Updating API
Fix facebook likes being counted independently for each tab on project sheet using og:url meta.  SEO, add Themes to keywords on project-sheet
Add missing include of bootstrap-dropdown in project-sheet menubar.html.  Fixes #1458
Merge branch 'hotfix/fix_1458'
Merge branch 'hotfix/fix_1458' into develop
replaced .project in .master
Merge branch 'hotfix/hvad_mig_again'