merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	Desktop Hotel/Hotel/Hotel/ListagemCliente.designer.vb