Merge branch 'hotfix/djangocms_2_4_upgrade'
Fix #1498 (impossible to edit project sheet header)
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
Onemenu page template list style tweaks
Merge branch 'hotfix/onemenu_visual_fixes'
Merge branch 'hotfix/onemenu_visual_fixes' into develop
Fix broken newsletter file upload; required updating django-filebrowser to a django 1.4 compatible one, and cascade dependencies update of django-tinymce and django_uploadify
Merge branch 'hotfix/fix_broken_newsletter_upload' into develop
Merge branch 'develop' of https://github.com/ImaginationForPeople/imaginationforpeople into release/sunnyspring
Fix email notification template
Merge branch 'release/questions-fixes' of https://github.com/atiberghien/imaginationforpeople into release/sunnyspring