Fix with latest version of core.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/censoredsoftware/infractions/conversation/Cite.java