final draft
Merge branch 'master' of https://github.com/vinit-ivar/XDictionary

Conflicts:
	src/tweaks/vinit/xdictionary/XDictionary.java