# This is a combination of 19 commits.
# The first commit's message is:
S3Selector.extract, implement in S3LocationSelector, apply in S3SQLInlineComponent

# This is the 2nd commit message:

GIS: Fix Tooltips & Popups for GeoJSON Layers

# This is the 3rd commit message:

S3LocationSelector to represent uncommitted rows (needed for inline components)

# This is the 4th commit message:

Location selector tweaks for MCOP: multiple-draw-tool can switch from wkt to lat/lon and back, experimental "zoom to wkt", bug fix: serialize is not enough after lxSelect and map selection (must indeed collect to link parent)

# This is the 5th commit message:

Location selector: update map after refresh, fix stupid scope problem with geocoder

# This is the 6th commit message:

Minify

# This is the 7th commit message:

title print page to 'Shipment Directions'

# This is the 8th commit message:

Fixing comments

# This is the 9th commit message:

Using module patterns to hide global vars

# This is the 10th commit message:

Removed extra query, set from address in the original record query

# This is the 11th commit message:

pass locations as data to map

# This is the 12th commit message:

Fixing the positioning of the dialog. It was hiding behind the top navbar
earlier

# This is the 13th commit message:

Make minimum bbox for single-points configurable per location selector.

# This is the 14th commit message:

Map selector height/width configurable.

# This is the 15th commit message:

Minify

# This is the 16th commit message:

Location selector: separate out overall layout of components (to make it
variable), support placeholders instead of labels

# This is the 17th commit message:

Cleanup.

# This is the 18th commit message:

CRMT/CRMT2 templates to use ICON.

# This is the 19th commit message:

Minify
Clean up
# This is a combination of 2 commits.
# The first commit's message is:

Clean up

# This is the 2nd commit message:

return to original js config
Clean up

Fixing the positioning of the dialog. It was hiding behind the top navbar
earlier

Revert "Fixing the positioning of the dialog. It was hiding behind the top navbar"

This reverts commit 0e2ce5fa994842a27d1f7d4c41ef36a5f91440ea.
Merge branch 'master' of https://github.com/xprimus/eden

Conflicts:
	modules/s3db/inv.py
	static/scripts/openMap.js
	views/openMap.js.html