1.2 Update, bugifxes and Logo file
Merge branch 'master' of https://github.com/BluSunrize/TravellersGear

Conflicts:
	options.txt