Updated GBIF maps to use iframe to GBIF service
Merge branch 'master' into new_gbif_maps
Merge branch 'master' into new_gbif_maps
Merge branch 'master' into new_gbif_maps

Conflicts:
	app/views/taxa/maps/_maps.html.haml
Removed data tab data search; doesn't work.
First approximation... not working yet, though.
Fixing broken specs
Ooops... totally forgot to commit code for WEB-4845 ... but now I need to merge...
Fixing cat-induced typo.  :|
Some fixes for bocce--main layout, no search term
Should fix a problem Lisa encountered.
Merge branch 'master' into new_gbif_maps
Updated GBIF maps to use iframe to GBIF service

(cherry picked from commit 628eedf907dde12788e1c53540fbfff9d3519a4f)

Conflicts:
	app/views/taxa/maps/_maps.html.haml
Merge branch '2013.12.10'
Moving the search thing over to the left...
Can now search using units, unit selection based on attribute selectes; no more italics in name on data search page; searching in clade should now include selected clade
Removed Beta warning messages
Updated the GBIF taxon link for the new maps
Merge branch '2013.12.10'
Updated GBIF maps to use iframe to GBIF service