moved Japanese Beetle to after Howling Wolf (again!)
moved Vampyres to *before* Wonderland
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