Manifest update
Merge remote-tracking branch 'origin/developer' into developer

Conflicts:
	WeMake/bin/AndroidManifest.xml