Merge branch 'django1.4'

there was a conflict with my qualifying the load_pipeline_run_xml function call

Conflicts:
	htsworkflow/frontend/samples/views.py

diff --cc htsworkflow/pipelines/retrieve_config.py
Simple merge

diff --cc htsworkflow/pipelines/srf.py
Simple merge

diff --cc htsworkflow/pipelines/test/test_runfolder_rta180.py
index eacae8c7f0e9db4aca1ee2573c391aba5a501f3e,0db7857399cd8f9c391a8b8c58fb0b5023fef0f5..2817328dc3a0fdcc415cc17e0c1adda725bebc37
--- 1/htsworkflow/pipelines/test/test_runfolder_rta180.py
--- 2/htsworkflow/pipelines/test/test_runfolder_rta180.py
+++ b/htsworkflow/pipelines/test/test_runfolder_rta180.py
@@@ -271,9 -271,9 +271,10 @@@ class RunfolderTests(TestCase)
          runs = runfolder.get_runs(self.runfolder_dir)
          self.failUnlessEqual(len(runs), 1)
          name = 'run_207BTAAXY_%s.xml' % ( date.today().strftime('%Y-%m-%d'),)
-         self.failUnlessEqual(runs[0].name, name)
+         self.failUnlessEqual(runs[0].serialization_filename, name)
+ 
  
 +
          r1 = runs[0]
          xml = r1.get_elements()
          xml_str = ElementTree.tostring(xml)