Workspace update
Merge branch 'master' of https://github.com/georgesom/AngularJS

Conflicts:
	.idea/workspace.xml