Merge branch 'develop' of D:\Project\MedicalEye with conflicts.
Merge remote-tracking branch 'origin/zhuzhiyong' into dinglei

Conflicts:
	eye-web/src/main/webapp/app/app.js
	eye-web/src/main/webapp/app/controllers/UserControllers.js
	eye-web/src/main/webapp/app/data/homeMenu.json
	eye-web/src/main/webapp/app/partials/personsettings.html
	eye-web/src/main/webapp/app/partials/statistics.html