Classroom update and delete done.
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/templates/classroom/form.jade