security页面修改
projects页面修改
Merge branch 'master' into careers
Merge branch 'master' into careers

Conflicts:
	app/views/admin/works/_form.html.haml
	public/uploads/image/thumb.jpg
调整后台截图的js
Merge branch 'master' of https://github.com/HuberyDu/bancheng

Conflicts:
	app/views/projects/show.html.haml
	config/routes.rb
	public/uploads/image/thumb.jpg