to be remove manually
Merge remote-tracking branch 'origin/master' into mele
Edit, Delete Subject Areas, Pop-Up Windows
Merge remote-tracking branch 'origin/mele'

Conflicts:
	Documentations/reference.txt
	Web App/SpryAssets/_notes/dwsync.xml
	Web App/bea/_class/database.php
	Web App/bea/admin/_notes/dwsync.xml
	Web App/bea/admin/addcourse.php
	Web App/bea/admin/addsubjectarea.php
	Web App/bea/admin/editcourse.php
	Web App/bea/form.css
	Web App/mele/_class/database.php

commit shell mele