Alterações
Alteracoes
Merge branch 'master' of https://github.com/guiwaltricke/EasyGym

Conflicts:
	EasyGym/Banco/data/db/data.properties
	EasyGym/nbproject/genfiles.properties
	EasyGym/nbproject/project.properties
	EasyGym/src/java/controller/EasyGymServlet.java
	EasyGym/src/java/modelo/Conexao.java
	EasyGym/src/java/modelo/PlanoDAO.java