Fixed a validation error message
Fixed more validation error message
Merge branch 'master' into devel

Conflicts:
	pressgang-ccms-model.iml