Arreglado conflicto
Merge remote-tracking branch 'origin/master'

Conflicts:
	Stalker.gmx/Stalker.project.gmx