Some UI updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	Feuds/Assets/level_1.asset
	Feuds/Assets/ui_demo.unity