Merge branch 'master' into sdo-sports

Conflicts:
	app.yaml
	data/examples.txt
Merge branch 'master' into sdo-sports
Merge branch 'master' into sdo-sports
Merge branch 'master' into sdo-sports
Merge branch 'master' into sdo-sports
Merge branch 'master' into sdo-sports
Merge branch 'master' into sdo-sports
Moved new Sports egs to sdo-sports to avoid merge conflict.
Resetting sdo-meltingpot examples from master.
Extension-specific examples now live in separate files.
Merge branch 'sdo-sports' into sdo-meltingpot

Conflicts:
	app.yaml