slide的name变成富文本
Merge branch 'master' of https://github.com/HuberyDu/bancheng

Conflicts:
	db/schema.rb
更新project的show页面
Merge branch 'master' of https://github.com/HuberyDu/bancheng