Form validation
Lots of minor changes
Merge branch 'forms'
Refactored resourceCtrl/Service
Just a huge commit... sorry
.
Merge branch 'huge-commit'
Fixes

sorry :/