new GUI for SSP
new GUI for SSP
Merge branch 'master' of github.com:nbe/smart-service-proxy

Conflicts:
	src/main/java/eu/spitfire_project/smart_service_proxy/core/httpServer/EntityManager.java