moved Geekz to after Freaks (Freaks and Geekz - heh)
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)