Modified Gemfile
Modified config/application.rb
Removed require_tree
Included rubyracer
Modified include tag
Modified extensions
Modified assets compress
Removed js comment
Merge remote-tracking branch 'remotes/heroku/master'

Conflicts:
	Gemfile