AngularJS 1.2.26.0
Merge branch 'feature/AngularJS' into Develop

Conflicts:
	AngularJS/params.rsp
1.3.0-rc4
Merge branch 'release/AngularJS_1.3.0-rc.4'