fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	global_dictionary_word_handlers.py