cc
commit with config files
Fix angularJS load without gem

Conflicts:
	config/application.rb
	config/database.yml
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/initializers/secret_token.rb
Merge remote-tracking branch 'rt/master'

Conflicts:
	Gemfile.lock