Test/apprentissage de git :)

je teste git :)
Merge branch 'develop' into feature/1307-group-needs
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
Merge branch 'hotfix/onemenu_visual_fixes'
Merge remote-tracking branch 'upstream/develop' into develop
add test if project_translation exist before project tags lookup to avoid crash on new project sheet creation
Projects map proof-of-concept
Update server_setup.rst

with solr installation
Update server_setup.rst
Update server_setup.rst