Tradução, school, css...
Merge origin/Sprint2 into Sprint2

Conflicts:
	todo.php