fixed stuff
Merge branch 'master' of https://github.com/IFA11B/ITAdmin.git

Conflicts:
	lib/DbConnector.class.php