Merge remote-tracking branch 'remotes/Dani/master'

Conflicts:
	src/cPlayer.cpp
	src/cPlayer.h
Merge remote-tracking branch 'remotes/Edu/master'
Merge branch 'master' of https://github.com/marcelgozalbo/MVJ2D

Conflicts:
	src/cPlayer.cpp