Signed-off-by: Chanh Wang <v_wangqianhe1@xdf.cn>
update
update
update
update
Merge branch 'develop' of https://github.com/wangqh/ispace.git into develop

Conflicts:
	app/css/index.css
	app/partials/home.html
Signed-off-by: Chanh Wang <v_wangqianhe1@xdf.cn>