adicionado rails admin
Merge branch 'master' of github.com:mauriciokj/AcheFacil

Conflicts:
	.idea/AcheFacil.iml
	.idea/workspace.xml