Merge remote-tracking branch 'origin/master'

Conflicts:
	config.xml

65
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit b50900310778da4976737fd6dac7b407d84a2111.
Merge branch 'master' of https://github.com/nigelemsen/Jelly-Wobble-1