reparación bugs
Merge branch 'sapu_III'

Conflicts:
	forgottenserver.s3db