Merge remote-tracking branch 'origin/request-modul-attempt' into request-modul-attempt

Conflicts:
	Cliente/client.js