seven lin commit
sevenlin commit
sevenlin commit
seven lin commit
Merge branch 'master' of https://github.com/GDOU-GMS/gymmanager.git

Conflicts:
	gymmanage/src/com/gms/dao/impl/ManagerDAOImpl.java