Updare New UI
Merge branch 'master' of https://github.com/picnii/taicome

Conflicts:
	js/Controller.js