updated old to latest build
Merge branch 'master' of https://github.com/ROGUE-JCTD/MapLoom
Merge branch 'master' of https://github.com/ROGUE-JCTD/MapLoom into init_from_config

Conflicts:
	ol3/ol-simple.js
	ol3/ol-whitespace.js
	ol3/ol.js
Merge branch 'init_from_config' of https://github.com/kelseyishmael/MapLoom into init_from_config
Added more refined feature merging.
Took out hardcoded CRSs and updated merge notification to zoom to features when clicked.
Added commit message to merges.
First pass on the feature edit dialog.
Added lat lon editor. Minor other improvements and bug fixes.
Added vector layer to display selected feature geometry.
added layers to map
first pass at wfs-t support. edits make it to server. will need another pass to improve.
Working on modifying geometry. Currently a work in progress.
Combined feature info box with geometry edit and attribute edit into a feature manager.
Removed hard coded crs projection, partially fixed a problem with deselecting while editing
more work on embedding map loom into geocode
updated bower to resolve version
load from config
more work on geocode integration
Updated ol3