Merge branch 'master' of /Users/Oressel/Development/projects/prophit-orrr/prophit with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	prophit-core/src/main/java/prophit/core/algorithms/impl/patternmatching/finder/impl/datamaping/IntDataTypeMapper.java
	prophit-core/src/main/java/prophit/core/algorithms/impl/patternmatching/papa/Papa3.java