fix crash for cops in mafia
Merge pull request #911 from MJB47/mafia

fix crash for cops in mafia
Add NU beta
Add NU to /dexsearch
Merge pull request #912 from TalkTakesTime/patch-2

Add NU to /dexsearch
Add Smogon Doubles as challenge only

For tournaments
Fix a crash in gen 1
Merge remote-tracking branch 'upstream/master' into config-refactor

Conflicts:
	chat-plugins.js
Fix permission problem with room owners unable to make a room public
Fix permission for /showimage