Change db_funct to database
Pop up menu script
Merge remote-tracking branch 'origin/mele'

Conflicts:
	Web App/bea/admin/addcourse.php
	Web App/mele/_class/database.php
	Web App/seini/_class/_notes/dwsync.xml
	Web App/seini/_class/database.php
	Web App/seini/editstaff.php