tubiaoxiugai

tubiaoxiugai
image

image
Merge remote-tracking branch 'origin/zhuzhiyong' into dinglei

Conflicts:
	eye-web/src/main/webapp/app/app.js
	eye-web/src/main/webapp/app/controllers/ComputerControllers.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/index.html