3rd commit
bu da 2
Merge branch 'master' of https://github.com/ihaltuntas/tesisatcilar

Conflicts:
	service-provider-service/target/m2e-wtp/web-resources/META-INF/maven/service-provider/service-provider-service/pom.properties
	service-provider-web/src/main/java/serviceprovider/web/controller/MainController.java
	service-provider-web/target/m2e-wtp/web-resources/META-INF/maven/service-provider-web/service-provider-web/pom.properties