edited database

elakiri
Merge remote-tracking branch 'origin/master'

Conflicts:
	adminDboard.php