Signed-off-by: Jingye Wang <4893278@qq.com>
Merge branch 'jingye'

Conflicts:
	themes/leather/views/layouts/main.php

Signed-off-by: Jingye Wang <4893278@qq.com>
Signed-off-by: Jingye Wang <4893278@qq.com>
replace hoder.js
Signed-off-by: wucangzhou <wucangzhou@gmail.com>
Merge branch 'master' into cangZhou
Signed-off-by: Jingye Wang <4893278@qq.com>
Merge branch 'master' of https://github.com/yincart/basic
Signed-off-by: Jingye Wang <4893278@qq.com>