corrections in borboleta_azul
Merge branch 'rails3' of https://github.com/CIRANDAS/themes into rails3

Conflicts:
	borboleta_azul/style.scss