Merge branch 'master' of https://github.com/ebroto/MVJ2D
Bugazo.
Player steps.
Arreglo les Animacions :)
Merge branch 'master' of https://github.com/ebroto/MVJ2D
Merge branch 'master' of http://github.com/marcelgozalbo/MVJ2D
Canvis per a que compili d'en Marcel.
Merge remote-tracking branch 'remotes/Dani/master'

Conflicts:
	src/cEnemyPersecutor.cpp