关闭右键
fix merge bug
添加自定义模版接口
Merge branch 'jack' of https://github.com/lln7777/zhuyun into user
Merge branch 'regui' of https://github.com/lln7777/zhuyun into user
修改忽略配置
修改配置
add filter.js
添加decodeURIComponent
Merge branch 'modelui' of https://github.com/lln7777/zhuyun into user

Conflicts:
	.gitignore
	config/config.coffee
添加状态码
修正登录逻辑
对前端的url encode不做处理
Merge branch 'user' of https://github.com/lln7777/zhuyun into modelui
Merge branch 'user' of https://github.com/lln7777/zhuyun into modelui
Merge branch 'modelui' of https://github.com/lln7777/zhuyun into user
自定义模版添加名字
修正接口，添加架构的时间
修改用户登录接口
公共模版接口