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
Merge pull request #14 from hatbot-team/diff

Diff