test

test2
Fixed login Html formatting
aa
added html graphic for main window
fixed main size
Merge branch 'SkyliveX-Ivan'

Conflicts:
	gui/maingui.html
	skylivex.pro.user
Testing merge with ivan
Add the base Franco's gui
Restore old default resolution for mainwin
Re-added maingui.html from Ivan's branch