Improve survey creation popup
Improve survey language selection
Better popup close handling (use apply/cancel when possible)
Merge branch 'master' of https://github.com/openforis/collect

Conflicts:
	pom.xml