Merge branch 'dev' into feature/215-ant-update-meta-xml

Conflicts:
	src/objects/Error_Settings__c.object
	src/objects/Error__c.object