Merge branch 'master' of https://github.com/ebroto/MVJ2D
Merge branch 'master' of http://github.com/marcelgozalbo/MVJ2D

Conflicts:
	src/cEnemyPersecutor.h
Merge branch 'master' of https://github.com/ebroto/MVJ2D

Conflicts:
	src/cEnemyPersecutor.h
++
Merge branch 'master' of https://github.com/roig/MVJ2D
++