Merge branch 'master' into sdo-itemlist

Conflicts:
	app.yaml
Merge branch 'master' into sdo-itemlist
Merge branch 'master' into sdo-itemlist
Merge branch 'master' into sdo-itemlist
sdo-itemlist.appspot.com
Merge branch 'master' into sdo-itemlist
Merge branch 'master' into sdo-itemlist
Merge branch 'master' into sdo-itemlist
Moved sdo-itemlist examples to own file, conflict avoidance.
Merge branch 'sdo-itemlist' into sdo-meltingpot

Conflicts:
	app.yaml