modify changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Wanna/.classpath
	Wanna/bin/AndroidManifest.xml