todos separados do main
Merge origin/master

Conflicts:
	app/config/main.php
	app/views/classroom/_form.php
	index.php