Improve code quality
Merge branch 'master' of https://github.com/Jcamilorada/Simulador

Conflicts:
	src/main/java/simulator/restservices/parameter/ParameterDTO.java
	src/main/java/simulator/restservices/parameter/ParameterResource.java
Fixed merge errors