Updates
Merge branch 'master' of https://github.com/guitarnut/AngularJS

Conflicts:
	6mdb Web/.idea/workspace.xml
Updates