AngularJS 1.2.26.0
Merge branch 'feature/AngularJS' into Develop

Conflicts:
	AngularJS/params.rsp