update
update
Merge branch 'develop' of http://pm.staff.xdf.cn/chanh/ispace into develop

Conflicts:
	app/js/services/services.js
update
update
Merge branch 'develop' of http://pm.staff.xdf.cn/chanh/ispace.git into develop
Merge branch 'develop' of http://pm.staff.xdf.cn/chanh/ispace.git into develop
update
update
update
update
update
update
update
Signed-off-by: Chanh Wang <v_wangqianhe1@xdf.cn>
update
update
update
update
update