add totoro support
Merge pull request #16 from Whitexp/gingerbread

add totoro support
follow frameworks changes
Merge remote-tracking branch 'cmx/gingerbread' into gingerbread

Conflicts:
	default.xml