gs add 17
Merge branch 'server' into local

Conflicts:
	Novo Documento de Texto.txt
Merge branch 'server' into local

Conflicts:
	Novo Documento de Texto.txt
gs add 20
Merge branch 'server' into local