Prevent status moves from activating Magician
Update UU bans

Alakazite -> banned
Volcarona -> BL
Staraptor -> UU
dubs update 1.5

next mon i gotta do is meganium
Merge branch 'patch-1' of github.com:Audiosurfer/Pokemon-Showdown into Audiosurfer-patch-1
Merge pull request #1016 from Audiosurfer/patch-1

dubs update 1.5
Missing comma
Happy chat plugin

This is a plugin for The Happy Place.  The purpose of this plugin is to create a command for a "Inspirational Quote of the Day", that will be changed by a room owner every day.  This plugin will aid the room for when the room's mood gets darker or not as "happy", per say.  Any voice or higher may broadcast this to remind the room of it at any time.  It gives inspiration to the users, which is more often than not a reason why some come in here.  (Please note: This command has been approved by The Happy Place room owners)
Fix trailing whitespace
Merge pull request #1017 from panpawn/patch-18

Happy chat plugin
Roomauth can see private commands
roomauth can use /modnote
Merge remote-tracking branch 'upstream/master'

Conflicts:
	command-parser.js
	commands.js