add mafia script
Merge pull request #908 from MJB47/mafia

add mafia script
Doubles is having a suspect test
Updated aliases.js for Mega-formes

Added commonly used aliases for the following Mega forms:
Mawile, Medicham, Venusaur, MewtwoX, and Mewtwo Y
Merge pull request #910 from CrestfallPS/patch-6

Updated aliases.js for Mega-formes
Merge remote-tracking branch 'upstream/master' into config-refactor
Merge branch 'config-refactor' into base
Add timeouts to customavatar
Merge branch 'base' into cafe-base
Merge branch 'cafe-base' into cafe

Conflicts:
	chat-plugins.js