上传 格式修改
Merge remote-tracking branch 'origin/developer' into developer

Conflicts:
	apis/application.js
	controllers/ctrl_app.js
application  plist删除
application  plist删除
Merge remote-tracking branch 'origin/developer' into developer