test111
abc
Merge remote-tracking branch 'origin/Seo'

Conflicts:
	multiUI/src/mainpackage/MainActivity.java
Merge remote-tracking branch 'origin/master' into Seo

Conflicts:
	multiUI/src/mainpackage/MainActivity.java
news
Merge remote-tracking branch 'origin/master' into Seo
Merge branch 'master' into Seo
complete