Merge branch 'develop'

Hanging commit message.
Merge branch 'master' of github.com:communityjs-tn/angular-scaffolding