Merge branch 'master' into develop

* master:
  Some Modifications for heroku
Made the command bar more fantastic
Merge branch 'develop'

* develop:
  Made the command bar more fantastic