Merge pull request #1057 from kotarou3/whitespace

Whitespace
Set modchat + in battles on lockdown
Check if modchat is set when lockdown is used
Add /modnote, !htmlbox and !showimage to /roomhelp
Slight HTML error
Merge pull request #1058 from panpawn/patch-21

Add /modnote, !htmlbox and !showimage to /roomhelp
NEXT: Move changes
NEXT: Update twister

Twister now gets a 50% boost from any quiver dance user (except smeargle) that holds a stick.
Merge pull request #1059 from Tempoanon/patch-13

NEXT: Move changes
Fix comma typo
Merge pull request #1061 from CreaturePhil/master

Fix comma typo
Kingdra is now banned in Mediocremons
Fix player disconnection ending turns prematurely
Add Hold Hands
Merge pull request #1062 from Slayer95/makerequest

Fix player disconnection ending turns prematurely
Fix crash when room doesn't exist in getIdentity()
Merge pull request #1064 from kotarou3/patch-1

Fix crash when room doesn't exist in getIdentity()
Merge remote-tracking branch 'upstream/master' into config-refactor
Merge branch 'config-refactor' into base

Conflicts:
	mods/gennext/moves.js