Sourcemap combination
Improved granularity of sourcemaps to improve output of map combination
Added performance check to test file
Boosted performance of source-map generation
Merge remote-tracking branch 'upstream/master' into sourcemap-combination

Conflicts:
	ng-annotate.js
	run-tests.js
Merge remote-tracking branch 'upstream/master' into sourcemap-combination
Merge branch 'sourcemap-combination' of https://github.com/smrq/ng-annotate into sourcemap-combination

Conflicts:
	run-tests.js
Propagate line/col information through fragments to improve perf of sourcemap generation
Removing extraneous newlines
stableSort is not in-place so skip copying
simplify compareLoc
pos to line column
Merge branch 'smrq-sourcemap-combination'

* smrq-sourcemap-combination:
  simplify compareLoc
  stableSort is not in-place so skip copying
  Removing extraneous newlines
  Propagate line/col information through fragments to improve perf of sourcemap generation
  Boosted performance of source-map generation
  Added performance check to test file
  Improved granularity of sourcemaps to improve output of map combination
  Sourcemap combination
disable pos-to-linecolumn