Created validations
Merge branch 'develop' of https://franklin.unfuddle.com/git/franklin_f14emrgit/ into develop