Merge branch 'master' of https://github.com/Spazbadger/BadgeBox

Conflicts:
	config.xml

Merge branch 'master' of
https://github.com/Spazbadger/BadgeBox

Conflicts:
	config.xml

Merge remote-tracking branch 'origin/master'

Conflicts:
	config.xml

Config update
go on then

ik
Revert "go on then"

This reverts commit f3cbfe9ef2108583e4277465028c916c705a4ed5.