NPM dependencies update
Merge branch 'master' of https://github.com/lmartins/AngularJS

Conflicts:
	package.json