Merge branch 'hotfix/0.5.4'

* hotfix/0.5.4:
  fixing the listing of the master branch for dev
can now disable the stage branch
Merge branch 'hotfix/0.5.5' into develop

* hotfix/0.5.5:
  can now disable the stage branch