Change structure of HeldStone to use branches instead of folders
Merge branch '2.x'

Conflicts:
	src/plugin.yml