fix search
term contains another term
fix sort
Merge branch 'master' of https://github.com/devstarter/ii into issue64
tagging terms #64, separate tagging for each term
Merge pull request #90 from Pas8sion/issue64

term contains another term
context menu
Merge branch 'ui' of https://github.com/devstarter/ii
context menu
содержание 2 тома
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
Merge branch 'issue64' of https://github.com/devstarter/ii
mark terms