编辑功能完善 上传 编辑模块层、格式调整
Merge remote-tracking branch 'origin/developer' into developer

Conflicts:
	apis/application.js
	controllers/ctrl_app.js
	views/common/app_add_sidebar.html