i Modified for include iExplorer
i
Merge branch 'master' of https://github.com/Tophans/jemma

Conflicts:
	jemma.osgi.javagal.gui/src/main/resources/webapp/home.html
	jemma.osgi.javagal.gui/src/main/resources/webapp/js/gestCreateCenterPane.js
	jemma.osgi.javagal.gui/src/main/resources/webapp/manageNetwork.html
	jemma.osgi.javagal.gui/src/main/resources/webapp/viewDevice.html
add new version
add manifest
Merge branch 'master' of https://github.com/Tophans/jemma

Conflicts:
	jemma.osgi.javagal.gui/src/main/resources/webapp/home.html
	jemma.osgi.javagal.gui/src/main/resources/webapp/manageNetwork.html.orig
	jemma.osgi.javagal.gui/src/main/resources/webapp/viewDevice.html