no message
Merge branch 'master' of https://github.com/rumblecoder/BrabbelCode

Conflicts:
	BrabbelCode/src/main/java/com/brabbelcode/PlaceholderReplacer.java