* '7.x-1.x' of git.drupal.org:project/leaflet:
  #1814028 - stripping out unused theme function and template file.

Replace hook_libarary() implementation with hook_libraries() and related changes to leaflet_build_map() and leaflet_requirements().

I don't recall the history of why leaflet depends on the libraries
module but doesn't implement it completely. This resolves that
discrepancy.

Ivan authored Nov 20, 2013 and Gabriel Carleton-Barnes committed Nov 20, 2013

#1814028 - Allow modules to update map details before rendering. Patch altered from original form to work with current codebase by gcb.

Refactor for more explicit plugin_style and formatter_info datastructures and to push popup form elements into leaflet_form_elements.

Lars Schröter authored Nov 18, 2013 and Gabriel Carleton-Barnes committed Nov 18, 2013

#1918170 - adds token support for display options. Adapted slightly by @gcb from original patch to allow all settings to use tokens, not just icons.

Adding hook_leaflet_map_prerender_alter to allow for module's to insert configuration not offered in the UI.

Refactored form generation to standardize between views & view modes. Added html icon capacity to map fields.