Removing DropHud from Bulk importer
Conflicts:
	pyfpdb/GuiBulkImport.py
Merge branch 'gimick'
Merge branch 'master' of git://git.assembla.com/fpdb-gimick
Experimental change to add parameters in stats gui

Added the 'Zoom' parameter to the game type reported in the Ring Player
Stats tab.
Fast gametype added to stats gui row description

Removed change to filters to include fast description.  Added in fast game
types for OnGame and Full Tilt.
Merge branch 'chaz' into newmaster
Added speed descriptor to tournament player stats
Removed radio buttons from GuiBulkImporter
PokerStars writes bounty tournaments with the buyin of '.00/-bash.50/-bash.20' in summary files or '.00+-bash.50+-bash.20' in hand histories. The -bash.50 is a separate part of the buyin paid by entrants and should be added to buyin for consistency
Moved SnG structure information into it's own module 'MergeStructures', added a second lookup table to account for May update.
Updated SWC hh path
Added lookup dict for PokerStars SnGs in order to grab speed information. Fixed bounty tournament support.
Deleted regression after rename
Recreated locale lang folders
Merge branch 'chazdazzle' into drflounder
Re-mapped for updated Merge structures