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

Conflicts:
	gymmanage/.settings/org.eclipse.core.resources.prefs