ini
Merge remote-tracking branch 're/master'

Conflicts:
	ServiceSystem/.myhibernatedata
	ServiceSystem/.mymetadata
	ServiceSystem/.project
	ServiceSystem/.settings/.jsdtscope
	ServiceSystem/.settings/org.eclipse.core.resources.prefs
	ServiceSystem/.settings/org.eclipse.jdt.core.prefs
	ServiceSystem/DB/servicesystem.pdb
	ServiceSystem/DB/servicesystem.pdm