moved validations from ResourceHelpers to Entities
Merge remote-tracking branch 'origin/master'