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

* 'master' of github.com:mwaylabs/generator-tmp2: