Merge branch 'hotfix/jade_template_path_error'

* hotfix/jade_template_path_error:
  Fixed issue where --template option should have been --layout within template sub-generator Fixed link issue for dashboard when creating jade files with template sub-generator
Merge branch 'release/v0.11.2'

* release/v0.11.2:
  v0.11.2
Merge branch 'master' into develop

* master: