Delete e Update de classborad
Merge origin/Sprint2 into Sprint2

Conflicts:
	app/views/classBoard/index.php
Merge origin/Sprint2 into Sprint2

Conflicts:
	app/views/classBoard/index.php