Merge branch 'spell-database-populater' into develop
Merge branch 'spell-database-populater' into develop

Conflicts:
	general/db_to_master_list_generator.py
	general/spell_db_populater.py
	general/spells.db
Spelling error
Merge branch 'develop' into spell-database-populater