[#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.
fixed problem with unique_together; move LOCK_EXPIRE into model and edited tasks to reflect that move
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.
Manually merge.
Merge branch 'develop' of github.com:parklab/refinery-platform into develop
Cleanup after merge.
Converted about page to flatblocks.
Updated documentation with information on instatiation of default page content after installation.
Merge branch 'develop' of github.com:parklab/refinery-platform into develop

Conflicts:
	refinery/settings.py
	refinery/templates/core/data_set.html
	requirements.txt
Add mail filter to avoid deprecation warning (https://docs.djangoproject.com/en/dev/releases/1.4/#request-exceptions-are-now-always-logged)
Fix for updated 'url' template tage in Django 1.5.
Add celerybeat service to Fabric script.  Code cleanup.
Removed custom error message from template.
Fixes 58897558. No longer trying to access name attribute of analysis if analysis does not exist.
Merge branch 'develop' of github.com:parklab/refinery-platform into develop
[#58897558] Simplify error handling logic in analysis_status() view.  Add the third required argument to custom_error_page() call.