precompile assets
Merge branch 'master' of https://github.com/cblair/portal
taking out jquery-upload from application.js
retaining jquery-upload in application.js