merge from jianfei
Merge branch 'master' of https://github.com/dahui1/saedemo

Conflicts:
	backend/.DS_Store