Commit
commit da noite
Merge branch 'master' of https://github.com/fabioar87/kidsetoys

Conflicts:
	kidsetoys/settings.pyc
	kidsetoys/urls.pyc
	usuario/urls.pyc
Commit do dia 19 de setembro - tarde