PHP and SQL finished for overall student view
Merge origin/master