Fix resource_type update and validator's form
Add before filters to resource type controller
Add tests to resources
Merge conflicts