Moved High School Drama to after Guardians of Order
* add jota account permissions to jenkins config
Merge pull request #734 from cgolubi1/733_jota_jenkins

add jota account permissions to jenkins config
* set puppet hostname for jenkins node so it can run puppet
Merge pull request #735 from cgolubi1/733_jota_jenkins

* set puppet hostname for jenkins node so it can run puppet
Tenchi, rest of BROM, Nerni and Yeti, fixed apples and changeling
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)
additions, changes, and availability to Fightball
fixed mirumoto.png (was named mirumota.png)
Merge pull request #746 from ManvilleFog/745_fightball

additions, changes, and availability to Fightball
Merge pull request #737 from ManvilleFog/138_button_images

Tenchi, rest of BROM, Nerni and Yeti, fixed apples and changeling