Integrar issue  #435 (Issue #346)
Merge branch 'dev-sprint5' of https://github.com/eloipuertas/ES2013Dimarts into dev-sprint5