Merge branch 'master' into structured_settings_B
fixing Conflicts in formhub/settings.py
Document use of preset folder rather than local_settings.py
remember to clean mongo database
Merge branch 'structured_settings_B' into generic