ver0.2.6_RC1
Merge remote-tracking branch 'origin/master'

Conflicts:
	Twawm/AndroidManifest.xml