Solved for application.html.erb on origin and master
Merge branch 'master' of github.com:pjotrsillekens/prototype