merge
merge

Merge branch 'master' of ssh://github.com/tubav/fiteagle into laptopDemo

Conflicts:
	delivery/interfaces/src/main/webapp/gui/css/FITeagle.css
	delivery/interfaces/src/main/webapp/gui/images/federation.png
	delivery/interfaces/src/main/webapp/gui/images/logo.png
	delivery/interfaces/src/main/webapp/gui/images/logo_project_openlab.png
	delivery/interfaces/src/main/webapp/gui/images/logo_project_panlab.png
	delivery/interfaces/src/main/webapp/gui/images/logo_sponsor_fp7.png
	delivery/interfaces/src/main/webapp/gui/index.html
	delivery/interfaces/src/main/webapp/gui/js/certificates.js
	delivery/interfaces/src/main/webapp/gui/js/index.js
	delivery/interfaces/src/main/webapp/gui/js/loginPage.js
	delivery/interfaces/src/main/webapp/gui/js/mainPage.js
	delivery/interfaces/src/main/webapp/gui/js/messages.js
	delivery/interfaces/src/main/webapp/gui/js/profile.js
	delivery/interfaces/src/main/webapp/gui/js/publicKeys.js
	delivery/interfaces/src/main/webapp/gui/js/registration.js
	delivery/interfaces/src/main/webapp/gui/js/server.js
	delivery/interfaces/src/main/webapp/gui/js/utils.js
	delivery/interfaces/src/main/webapp/gui/js/validation.js