Merge remote-tracking branch 'origin/Seo'

Conflicts:
	multiUI/src/mainpackage/MainActivity.java