Fix bug conflictos player en la build (Issue #186)
Merge branch 'dev' of https://github.com/eloipuertas/ES2013Dimarts into dev