Include latest tangram 0.9 changes to separate gae support from spring