edit
Merge remote-tracking branch 'origin/mele'

Conflicts:
	Web App/mele/_class/db_funct.php
	Web App/mele/student.php
	Web App/seini/Login2.php

shell merging
Login latest
Edit Students & Header Footer Function
Icons
merging some files might be deleted
merge 2
Login and List Staff

- Bea
Login and Staffs -Bea
Change db_funct to database
Edit Staff and 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
merge