deleted the redundant db stuff
Merge branch 'master' into branch1

Conflicts:
	public/login.php