Merge branch 'master' of https://github.com/windwhinny/himingtian

Conflicts:
	public/css/common.css
..
update
Merge branch 'master' of https://github.com/youthmyth/himingtian

Conflicts:
	public/css/common.css