basic angular yeoman
Merge branch 'develop'