Merge remote-tracking branch 'origin' into layout-yugo
sprites, tela-info, uma parte do perfil feitas.
merge done
Escolas view
Improving
Improving
Merge remote-tracking branch 'origin/master' into layout-yugo

Conflicts:
	app-firefoxOS/app.html
	backend/get_data.pyc
Merge remote-tracking branch 'origin/layout-yugo'

Conflicts:
	app-firefoxOS/app.html