Merge origin/master

Conflicts:
	src/java/Ah10/comandos/ReqIni.java
	src/java/Ah10/principal/ConexaoRep.java