update ui
Merge branch 'master' of https://github.com/CloudSide/WaveTrans

Conflicts:
	WaveTrans.xcodeproj/project.pbxproj