++
Merge branch 'master' of https://github.com/roig/MVJ2D
Fix warning.
Merge remote-tracking branch 'remotes/Edu/master'
++
Merge remote-tracking branch 'remotes/Edu/master'
++
++
++
Fix enemy animations.
Merge remote-tracking branch 'remotes/Edu/master'

Conflicts:
	src/cEnemyPersecutor.cpp
Attack enemy faced.
++
++
TODO PETE FINAL...
Merge branch 'master' of https://github.com/ebroto/MVJ2D
Merge branch 'master' of http://github.com/marcelgozalbo/MVJ2D
Animacio quan toquen al jugador (estat nou)