Minor changes.
Merge branch 'master' of https://github.com/ash-c/pirategame

Conflicts:
	bin/data/papyrus/errors.log
	bin/data/xml/saveState.xml
Merge branch 'master' of https://github.com/ash-c/pirategame
Final commit