Local Allen
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/menu/share.xml