comibine ui
Merge branch 'master' of https://github.com/w2moon/AnotherWorld

Conflicts:
	data