Local changes
Merge branch 'master' of github.com:mrvdot/angular-users

Conflicts:
	scripts/users.js