Cleaned up actions and routes to be more restful
Merge branch 'routesandactions'