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

Conflicts:
	prophit-algo-factory/src/main/java/prophit/patternmatching/impl/gptpatternrecognizer/GptPatternRecognizer.java
Card #152
https://trello.com/c/SEXqC5x1