Pooja | #3681 | Fixing django error due to incorrect arguements passed
Ajay/Melanie | #0000 | Updated requirements to point to 12_1_release mangrove
Ajay/Melanie | #3806 | Django error - Increased timeout for elasticseach queries
Ajay/Melanie | #3828 | Bugfix - Import submissions with french template not working
Ajay/Melanie | #0000 | Merge branch 'release_12_1' into develop

Conflicts:
	datawinners/entity/views.py
	requirements.pip