Actualizado

Actualizado 08/12/2014
Merge remote-tracking branch 'origin/master'

Conflicts:
	Data/Texto.bmp
	Source/Config.h
	Source/Game.cpp
	Source/Game.h
	Source/Nave.cpp
	Source/Nave.h
	Source/Sprite.cpp
	Source/Sprite.h
	Source/SpriteDef.cpp
	Source/SpriteDef.h