Merge of new views with heroku scaffolding