started to fix GUI
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/js/loginPage.js
	delivery/interfaces/src/main/webapp/gui/js/mainPage.js