Merge remote-tracking branch 'upstream/master' into feature/mergeconfigfiles

Conflicts:
	VikingBot.php
Merge remote-tracking branch 'upstream/master' into feature/mergeconfigfiles

Conflicts:
	README
Merge branch 'feature/mergeconfigfiles'