heroku conf added
corrected application.js for heroku
Merge branch 'master' into db-mongo