Merge branch 'Upstream/master'

Conflicts:
	conf/readme.txt
	db/pre-re/item_db.txt
	doc/item_bonus.txt
	doc/script_commands.txt
	sql-files/item_db.sql