Commit all Montpelier changes except static/admin since the admin
code might be moved or derived differently.

Signed-off-by: Bob Troester <joanske@sover.net>
Reorganize local_settings.py/settings_montpelier.py to match local_settings_example.py

Signed-off-by: Bob Troester <joanske@sover.net>
Merge branch 'v1.3' into mtm

Conflicts:
	treemap/management/commands/resave_trees.py
Remove local templates in favor of updated official templates

Signed-off-by: Bob Troester <joanske@sover.net>
Merge branch 'v1.3' into mtm
clarify comment, remove unnecessary jlivni kml file
Signed-off-by: Bob Troester <joanske@sover.net>
Updated choices to match Beyer data,
and change index page background picture.
Advanced filter changes due to choices change
and new picture.
Signed-off-by: Bob Troester <joanske@sover.net>
Final fixes for uimport and doc
Signed-off-by: Bob Troester <joanske@sover.net>
Merge branch 'v1.3' into mtm
Change CHOICES for montpelier, show pests in user interface
Signed-off-by: Bob Troester <joanske@sover.net>
Merge branch 'v1.3' into mtm
Add local ITREE_REGION and show admin edits.
Signed-off-by: Bob Troester <joanske@sover.net>
Fix one completely confused comment in uimport.
Signed-off-by: Bob Troester <joanske@sover.net>
Merge branch 'v1.3' into mtm
Merge branch 'v1.3' into mtm

Conflicts:
	static/js/map.js

Signed-off-by: Bob Troester <joanske@sover.net>
Signed-off-by: Bob Troester <joanske@sover.net>