renamed
Merge branch 'master' of https://github.com/designxtek/typescript-marionette