Bunch of changes
Merge branch 'master' of github.com:lucasprus/yeoman_angular_app