Fixed issue with legend not working when map loom is imbedded in geonode.
temporarily disable proxy since it is dropping the www.auth header
Made it so after you add a feature it switches to modify controls.
testing Jenkins commit trigger
Fixed a few bugs with feature editing.
Revert "testing Jenkins commit trigger"

This reverts commit 5059074d1d76f4469b3a3f0e90eb2abbbf08d121.
Revert "temporarily disable proxy since it is dropping the www.auth header"

This reverts commit f2e5bdf89a77b0af721528f396301000a72b4c18.
Fixed a few bugs.
Fixed issues with resolving conflicts that involved deleted features.