onenable, ondisable, asubbot
subbothandler : asubbot
enabledisablesubbot saker
skitsaker
Code Boxes, protection undone
.
småsaker
Merge branch 'master' of https://github.com/CheeseSoftware/MasterBot

Conflicts:
	src/MasterBot/SubBot/WorldEdit/WorldEdit.cs
Merge remote-tracking branch 'origin/Ost'
Merge branch 'master' of https://github.com/CheeseSoftware/MasterBot
github torllade
.
Merge branch 'master' of https://github.com/CheeseSoftware/MasterBot

Conflicts:
	src/MasterBot/SubBot/WorldEdit/WorldEdit.cs
Merge remote-tracking branch 'origin/Ost'

Conflicts:
	src/MasterBot/Bot/MasterBot.cs
	src/MasterBot/Room/Room.cs
	src/MasterBot/SubBot/WorldEdit/WorldEdit.cs
merged