Reload on login
Fix issue 1
Merge branch 'issue1'

Conflicts:
	db.php