AI-579 Fixed encoding problem on loading of test resources
Merge branch 'version4' of github.com:bedatadriven/activityinfo into version4
AI-614 Quick fix for BarCodeType
AI-615 Implemented BarcodeFieldWidget, HTML5 bar code scanner
AI-614 Fixes for BarCodeType and EnumFieldWidget
Merge branch 'version4' of github.com:bedatadriven/activityinfo into version4

Conflicts:
	core/model/src/main/java/org/activityinfo/model/type/TypeRegistry.java