Merge branch 'master' of http://114.215.100.48:3000/ipu/android-share

Conflicts:
	multiple-client/src/com/ai/mobile/multiple/SubAppActivity.java