Merge branch 'master' into reputation

Conflicts:
	src/main/java/com/servioticy/dispatcher/bolts/PrepareBolt.java