Frontend changes
Bring frontend up to master
Merge branch 'master' of https://github.com/xldenis/dynamite

Conflicts:
	config/routes.rb
Merge branch 'master' of https://github.com/xldenis/dynamite
Update Gemfile.lock
Finish frontend merge
Add api routes