Made annotation selectors more specific (div.) in order to override ace's annotations.
Merge pull request #1467 from dart-lang/umop-annotations-icons

Fix annotation icons to override ace's
Moved global template vars from templates.dart to spark.dart

The stylistic benefit of this shows up in the subsequent work related to Bower support in a different branch.
Merge pull request #1476 from ussuri/addl-rework-in-templates.dart

Moved global template vars from templates.dart to spark.dart
Merge remote-tracking branch 'refs/remotes/upstream/master' into support-bower

Conflicts:
	ide/app/spark.dart