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 branch 'develop' into release/sunnyspring
update i18n catalogs
changed settings to include haystack, and forceSolr in site_settings
small bug due to merge from old version of template maybe. INTEGRATION NEEDED on workgroup header zone
fixed JS and titles in template
fixed JS and titles in template and fixed location filter name
Merge branch 'release/sunnyspring' of https://github.com/ImaginationForPeople/imaginationforpeople into release/sunnyspring

Conflicts:
	apps/i4p_base/static/js/search/search_filter.js
fixed bad action link in header search form
fixed bad action link in header search form
remaining dirty code removed
Merge branch 'release/sunnyspring' of https://github.com/ImaginationForPeople/imaginationforpeople into release/sunnyspring
Adding wiki article to API group view