Started upgrade to Django 1.5. Started integration of AngularJS with djangular.
[#56022514] Graph no longer included in resource list, only in resource detail.
Merge branch 'develop' of github.com:parklab/refinery-platform into develop
Started upgrade to Django 1.5. Started integration of AngularJS with djangular.
Started upgrade to Django 1.5. Started integration of AngularJS with djangular.
Merge branch 'node_relationship_ui_feature' of github.com:parklab/refinery-platform into node_relationship_ui_feature
Updated 'url' in templates for Django 1.5.
Skipping of broken Galaxy instances when importing workflows.
Removed PrettyJSONSerializer from Core API.
Started upgrade to Django 1.5. Started integration of AngularJS with djangular.
Updated 'url' in templates for Django 1.5.
Skipping of broken Galaxy instances when importing workflows.
Removed PrettyJSONSerializer from Core API.
Merge branch 'node_relationship_ui_feature' of github.com:parklab/refinery-platform into node_relationship_ui_feature
Merge branch 'develop' of github.com:parklab/refinery-platform into develop

Conflicts:
	refinery/settings.py
Clean up logging statement.
accidentally pushed a version of settings.py where South was disabled.  South is now enabled again by default.
Added support for django-flatblocks.
Fixed bug in core models introduced by changes to external tool status model.
Changes to experimental angular code.