Issues #9 e #12
Merge branch 'master' of https://github.com/leonardoad/Momoca

Conflicts:
	src/ultilitarios/Conexao.java

Fix conflicts