Merge origin/master

Conflicts:
	onde-se-hospedar/public_html/index.html