Adding commits from previous project
Fixing tests
Removing #reactivate method
Cleaning reactivate path
Setting 410 properly
Adding code for Templates
Adding field to serializer
Merge branch 'master' into feature/soft-delete
Adding proper paths
Cleaning Serializer
Merge branch 'master' into feature/soft-delete

Conflicts:
	spec/dummy/db/structure.sql
Merge pull request #6 from enova/feature/soft-delete

Soft-Deletes