content  添加画面   框架
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/javascripts/contents.view.js
content  添加画面   框架