fix sort
Merge pull request #90 from Pas8sion/issue64

term contains another term
Merge branch 'issue64' of https://github.com/Pas8sion/ii into issue64

Conflicts:
	src/main/java/org/ayfaar/app/utils/TermsMarker.java
Merge remote-tracking branch 'origin/issue64' into issue64
#93, lookup for uppercase