Fix minnor bug
Merge branch 'master' of github.com:imron02/SIA

Conflicts:
	formlogin.cpp
	mainwindow.cpp
	mainwindow.h