Moved High School Drama to after Guardians of Order
moved Japanese Beetle to after Howling Wolf (again!)
moved Vampyres to *before* Wonderland
moved Geekz to after Freaks (Freaks and Geekz - heh)
Merge pull request #740 from ManvilleFog/726_reorder_btnsql3

Moved High School Drama to after Guardians of Order
Merge remote-tracking branch 'upstream/master' into 726_reorder_btnsql2

Conflicts:
	deploy/database/data.button.sql
Merge pull request #741 from ManvilleFog/726_reorder_btnsql2

moved Japanese Beetle to after Howling Wolf (again!)
Merge pull request #742 from ManvilleFog/726_reorder_btnsql4

moved Vampyres to *before* Wonderland
Merge remote-tracking branch 'upstream/master' into 726_reorder_btnsql5

Conflicts:
	deploy/database/data.button.sql
Merge remote-tracking branch 'upstream/master' into 726_reorder_btnsql5

Conflicts:
	deploy/database/data.button.sql
Merge pull request #744 from ManvilleFog/726_reorder_btnsql5

moved Geekz to after Freaks (Freaks and Geekz - heh)
Merge remote-tracking branch 'upstream/master' into 745_fightball