add Login Page
Merge remote-tracking branch 'upstream/master'

Conflicts:
	jemma.osgi.javagal.gui/src/main/resources/webapp/manageNetwork.html
	jemma.osgi.javagal.gui/src/main/resources/webapp/viewDevice.html
Merge remote-tracking branch 'upstream/master'
change login page
fix minor bug
Bug Fix on WebGui