add hstore
add locations
api routes
Merge branch 'master' of github.com:TrailSafe/server

Conflicts:
	config/routes.rb
activity methods
api controllers
redirect in application controller
api views
powder settings
controller specs
add rabl
structure
api controllers
activity additions
route changes
Merge branch 'master' of github.com:TrailSafe/server