Code Cleaning
Merge remote-tracking branch 'origin/master'

Conflicts:
	Aplicacion/target/classes/es/model/article/ArticleDAO.class
	Aplicacion/target/classes/es/model/service/ArticleService.class