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

Conflicts:
	src/ng/compile.js
	src/ng/urlUtils.js
feat($timeout): Add debouncing support to $timeout service

This feature allows resetting the timer on an ongoing `$timeout` promise.

A fourth optional argument is added to `$timeout` which is the
old promise to be reset.

I.e.: `promise = $timeout(fn, 2000, true, promise);`

This will call `fn()` 2 seconds after the last call to the `$timeout()`
function.
v1.2.0-rc.2-ts