Service library changes
Merge branch 'master' into service_lib

Conflicts:
	app/src/main/java/org/dartlang/service/ServiceClass.java
Factor out common code in JSON upgrade code
Merge pull request #1 from johnmccutchan/service_lib

Service library changes