new
Merge branch 'master' of https://github.com/taxet/Msi-Project.git

Conflicts:
	Msi-Project/src/com/mercury/demand/web/controller/AdminController.java