优化功能
N 多更改
修正接口
删除无用文件
Merge branch 'jack' of https://github.com/lln7777/zhuyun into user
Merge branch 'newui' of https://github.com/lln7777/zhuyun into user

Conflicts:
	public/stylesheets/index.css
	views/index.ejs
delete login.ejs
 Merge branch 'user' of https://github.com/lln7777/zhuyun into regui

Conflicts:
	public/javascripts/funcs.coffee
	public/javascripts/funcs.js
	public/javascripts/index.js
	public/stylesheets/index.css
	views/index.ejs
	views/main.ejs