Merge branch 'hotfix/0.5.3'

* hotfix/0.5.3:
  now hiding stage branch
fixing the listing of the master branch for dev
Merge branch 'hotfix/0.5.4' into develop

* hotfix/0.5.4:
  fixing the listing of the master branch for dev