Add git merge UI.
Add git merge.
Merge branch 'master' into git_merge
Add git merge command.
Remove debug messages.
Added comments and indent fixes.
Upgrade to latest Web Starter Kit
Add description for Web Starter Kit in New Project dialog
fix a timing issue with dart analysis
fix an issue with dart2js and spaces in the path
Implement new Json parser reporting source locations.
Update JsonBuilder to use new json parser.

The new json parser reports accurate source locations.
Add a standalone unittest Dart app.

* Include "json_parser_test" only as a first step.
Address code review feedback.
Abide to the 80-column limit.
Rename "utils.dart" to "json_utils.dart".
Address code review feedback.
Merge branch 'master' into git_merge
Address code review feedback.
the changes made in #2829 are, for some reason, not in the master repository anymore.I've added them back.