Refactor UI tests to be simpler
Update to the latest version of Django Hstore

Both of the changes made in our fork have been accepted upstream.
Merge pull request #1690 from steventlamb/topic/refactor_ui_tests

Refactor UI tests to be simpler
Merge pull request #1692 from maurizi/update-django-hstore

Update to the latest version of Django Hstore
Don't create tree when udfc data is empty

fixes #1077 on github
Merge pull request #1689 from steventlamb/topic/dont_create_tree

Topic/dont create tree
Change modeling feature names
Set data attribute when resolving alerts

Fixes #1698

This fixed a regression introduced by 1f0f44e1, which stopped reading
values from .html() and started reading values from .attr(). The resolve
button was setting the body text of the element, but not the data
attribute.
Merge pull request #1700 from jwalgran/topic/fix-alert-resolution

Set data attribute when resolving alerts
Merge pull request #1695 from RickMohr/template-tweak

Change modeling feature names
Merge pull request #1693 from kdeloach/topic/url-state

Rename mapState.js to urlState.js
Add get/set functions on urlState

This adds the ability to stick arbitrary pieces of state information in
the URL.