Fox for hour
Merge branch 'master' of https://github.com/OnPositive/wordnet.git

Conflicts:
	com.onpositive.wordnet.tests/src/com/onpositive/wordnet/tests/WordNetEditTest.java
	com.onpositive.wordnet.tests/src/com/onpositive/wordnet/tests/tst.xml