Remove underscore-min.js from the assets (it's already in bower.json)
Merge branch 'development' into nicks-redesign