Rebase from Master

Merge remote-tracking branch 'origin/master' into Angular-1.2.0-rc.2

Conflicts:
build/angular-routing.js
build/angular-routing.legacy.min.js
build/angular-routing.min.js
build/src/directives/jemView.js
build/src/route.js
build/src/state.js
build/src/state/stateBrowser.js
build/src/view.js
build/test/state/stateBrowser.js
build/test/stateSpec.js
gruntfile.js
samples/plunker1/about.html
samples/plunker1/about.module.js
samples/plunker1/demo.js
samples/plunker1/index.html
src/common.ts
src/directives/jemView.ts
src/route.ts
src/state.ts
src/state/refs.d.ts
src/state/stateBrowser.ts
src/view.ts
test-dev-jqlite-config.js
test-dev-jquery-config.js
test/stateSpec.ts