Fixed config.ru, Procfile
Edited config/application.rb to match Rails Heroku Asset requirements
Merge branch 'master' into dev