属性页面样式修改
Merge branch 'master' of github.com:gokuai/fengcloud

Conflicts:
	app/styles/app.css
	app/views/file_property_dialog.html
属性页面修改