workspace.xml
Merge branch 'develop' of https://github.com/goldfing/AngularJS-Demo into develop

Conflicts:
	.idea/workspace.xml