update package json to work in heroku
remove commands in package.json for heroku
Merge branch 'develop'

Conflicts:
	package.json