Merge branch 'master' of https://github.com/angular/angular.js

Conflicts:
	src/ng/compile.js
	src/ng/urlUtils.js