Fix some bugs with mega evolution graphics
- Don't play the forme change animation when switching in.
- Fix interaction with illusion in the base forme (http://replay.pokemonshowdown.com/almostanyability-117184227 Turn 11)
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
New UU suspect
Fix permission problem with room owners unable to make a room public
Fix crash when mafia give no target
Merge pull request #914 from MJB47/patch-1

Fix crash when mafia give no target
Fix crash in Bide
Sync learnsets
Fix Gen 1 Struggle

Struggle was normal type in gen 1, not ??? type
Update missing two-turn moves
From older gens
Merge pull request #916 from Slayer95/master

Update missing two-turn moves
MegaEvo: tell the client that the change is permanent
Merge branch 'config-refactor' into base

Conflicts:
	mods/gen1/scripts.js