Added basic diff functional
Merge branch 'master' into diff
Merge branch 'master' into diff
added diff tool
checkstyle
Merge branch 'master' into diff

Conflicts:
	preparation/resources/SampleResource/SampleResource.py
	preparation/resources/SampleResource/__init__.py
implicit cast to str fixed
SampleResource
Added frequency module
Merge branch 'diff' of https://github.com/hatbot-team/hatbot_resources into synonyms-antonyms
Merge branch 'frequency' of https://github.com/hatbot-team/hatbot_resources into synonyms-antonyms
Added synonyms quality and priority rate calculation
started to do gap inflection
Added functionality
replaced redundant decorator
fixed typo
Merge branch 'gap_inflection' into phrasal-resources
Added case question instead of gap