Cyrus Najmabadi 0391e02fee Merge branch 'master' into sourceFileUpdate
Conflicts:
	src/compiler/parser.ts
	src/services/formatting/tokenSpan.ts
	src/services/text.ts
2014-12-11 18:08:57 -08:00
..
2014-12-04 17:43:51 -08:00
2014-12-04 17:43:51 -08:00
2014-12-04 17:43:51 -08:00
2014-12-04 17:43:51 -08:00
2014-12-04 17:43:51 -08:00
2014-12-04 17:43:51 -08:00
2014-12-04 17:43:51 -08:00
2014-12-04 17:43:51 -08:00
2014-12-04 17:43:51 -08:00
2014-12-04 17:43:51 -08:00
2014-12-04 17:43:51 -08:00
2014-12-04 17:43:51 -08:00
2014-12-04 17:43:51 -08:00
2014-12-04 17:43:51 -08:00
2014-12-10 14:44:31 -08:00
2014-12-10 14:44:31 -08:00
2014-12-04 17:43:51 -08:00
2014-12-04 17:43:51 -08:00