Just a commit
Up to date
Merge remote-tracking branch 'origin/master' into Quality

Conflicts:
	b/war/WEB-INF/deploy/uibinderindex/symbolMaps/0211F86D21C719D4FDFEB1EDB1775509.symbolMap
	b/war/WEB-INF/deploy/uibinderindex/symbolMaps/1699F8A78F5870901C6C86669133B414.symbolMap
	b/war/uibinderindex/1699F8A78F5870901C6C86669133B414.cache.js
	war/WEB-INF/.DS_Store
	war/WEB-INF/deploy/uibinderindex/symbolMaps/22C8C90248F379131D3FCEAAC67A343D.symbolMap
	war/WEB-INF/deploy/uibinderindex/symbolMaps/B34F921ADC53F1CDA2B5703DDBF359E7.symbolMap
	war/WEB-INF/deploy/uibinderindex/symbolMaps/BF1240433A1C997EEC60FDEC01EC2FCA.symbolMap
	war/WEB-INF/lib/appengine-api-1.0-sdk-1.9.4.jar
	war/WEB-INF/lib/appengine-api-labs.jar
	war/WEB-INF/lib/appengine-endpoints-deps.jar
	war/WEB-INF/lib/appengine-endpoints.jar
	war/WEB-INF/lib/appengine-jsr107cache-1.9.4.jar
	war/uibinderindex/0211F86D21C719D4FDFEB1EDB1775509.cache.js
	war/uibinderindex/B34F921ADC53F1CDA2B5703DDBF359E7.cache.js
	war/uibinderindex/compilation-mappings.txt
	war/uibinderindex/uibinderindex.nocache.js