UI finish
Merge branch 'master' of https://github.com/gaozihan3g/PiJam

Conflicts:
	PiJam/Assets/scene/test2.unity