merge
Merge branch 'master' of github.com:mwaylabs/generator-tmp2

* 'master' of github.com:mwaylabs/generator-tmp2:
  Use M.Router instead of Backbone.Router