error and data validations: closes #37
Merge branch 'development' into staging