Cleanup
Merge branch 'staging' of https://github.com/alexandre-bernardo/rede-de-carpintarias into staging

Conflicts:
	public/img/Thumbs.db