Card #165
https://trello.com/c/jezG824D
Merge remote-tracking branch 'origin/master'

Conflicts:
	prophit-core/src/main/java/prophit/core/algorithms/impl/patternmatching/finder/impl/FinderImpl.java
	prophit-core/src/main/java/prophit/core/algorithms/impl/patternmatching/gptpatternrecognizer/GptPatternRecognizer.java
Card #165
https://trello.com/c/jezG824D