Added an index to aid performance
Merge branch 'master' into magicmonkey-db_index

Conflicts:
	db/patch43.sql