add migration
add migration & fix test
fix bugs found by travis
Merge branch 'activate_forms_setting3' into eHealth_staging

Conflicts:
	main/tests/test_crowdforms.py
	odk_logger/migrations/0034_renaming_column_downloadable.py