upgrades marionette
Merge branch 'develop' of github.com:blitzagency/rich into develop

* 'develop' of github.com:blitzagency/rich:
  fixing constraints
git status