gym service
gym service 2
Merge branch 'master' of https://github.com/ruzovvo/Laundry

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/Laundry/Laundry/pom.properties
gym service 2
Merge branch 'master' of https://github.com/ruzovvo/Laundry

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/Laundry/Laundry/pom.properties