Merge branch 'dev' of https://github.com/lln7777/zhuyun into newui

Conflicts:
	public/javascripts/index.js
 Merge branch 'dev' of https://github.com/lln7777/zhuyun into newui

Conflicts:
	public/javascripts/index.js
Merge branch 'newui' of https://github.com/lln7777/zhuyun into merge

Conflicts:
	public/javascripts/funcs.coffee
Merge branch 'merge' into dev