Merge branch 'master' into Brendo

Conflicts:
	src/br/com/academia/conexao/Conexao.java