Update .gitignore
Update .gitignore
Fixed userdictionary
Merge remote-tracking branch 'origin/master'
merge all
added smth
Merge remote-tracking branch 'origin/master'

Conflicts:
	objects/global_dictionary_word.py
added smth
Fixed userdictionary test
Fixed userdictionary test
del unused method
Merge remote-tracking branch 'origin/master'
fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	global_dictionary_word_handlers.py
fixed tests
Fixed userdictionary test
added deletions
Added editing personal dictionary webinterface prototipe
del unused import
Merge remote-tracking branch 'origin/master'