数据库初始化
Merge branch 'master' of https://github.com/gokuai/yunku-setup
样式修改
Merge branch 'master' of github.com:gokuai/yunku-setup
初始化数据库
Merge branch 'master' of https://github.com/gokuai/yunku-setup
数据库配置检查
aaa
改名
Merge remote-tracking branch 'origin/feature/js'

Conflicts:
	public/web/js/ajax.js
收集多组数据，mail设置
Merge remote-tracking branch 'origin/master' into feature/js