some changes from views.coffee
Merge branch 'some-changes'