i Merged with upstream repository
Merge branch 'master' of https://github.com/Tophans/jemma

Conflicts:
	jemma.osgi.javagal.gui/src/main/resources/webapp/manageNetwork.html
Added configureEndpoint servlet, managed login in servlet and webGui