123
Merge remote-tracking branch 'origin/master' into Seo

Conflicts:
	multiUI/src/mainpackage/MainActivity.java