Fix error deleting data error type
Merge branch 'datacleansingtoolkit' of
https://github.com/openforis/collect into datacleansingtoolkit

Conflicts:
	collect-web/collect-webapp/src/main/webapp/js/collect/collect.js
	collect-web/collect-webapp/src/main/webapp/js/collect/datacleansing/data_error_type_dialog.js