cookies and sql queries on dash.php
cookies and sql queries on dash.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	ABET/Home/Dashboard/dashboard.html
updated database script