Merge branch 'dev'
added support for heroku
added node modules folder to gitignore