Test/apprentissage de git :)

je teste git :)
Merge branch 'develop' into feature/1307-group-needs
Simplifying groups list using the API with less fields
Adding a size limit for images on group details api view
Merge branch 'develop' of https://github.com/ImaginationForPeople/imaginationforpeople into develop
Merge branch 'develop' of https://github.com/ImaginationForPeople/imaginationforpeople into develop
Merge branch 'master' of https://github.com/ImaginationForPeople/imaginationforpeople into develop
Merge branch 'hotfix/fix-project-api' into develop

Conflicts:
	apps/api/views/workgroup.py
Merge remote-tracking branch 'upstream/develop' into develop
Adding wiki article to API group view
Search API now uses new project-sheet model
Merge branch 'hotfix/fix-api-search' into develop
Merge branch 'develop' of https://github.com/ImaginationForPeople/imaginationforpeople into develop

Conflicts:
	apps/project_sheet/search_indexes.py
Merge branch 'feature/newgroups' into develop
Projects map proof-of-concept
Update server_setup.rst

with solr installation
Update server_setup.rst
Update server_setup.rst
Update server_setup.rst
Add a flushmemcache() task to fabfile, and run it automatically as part of reloadapp if in prodenv