Added initial Heroku support
Merge branch 'development' into integration

* development:
  Added initial Heroku support
Merge branch 'integration'

* integration:
  Added initial Heroku support