Merge remote-tracking branch 'origin/master'

Conflicts:
	dbAccess.php
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	attendance/markAttendance.php
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	dbAccess.php