Merge branch 'dev' into test

diff --cc buildout.cfg
index 1e20a10,74c2627..62e839b
--- 1/buildout.cfg
--- 2/buildout.cfg
+++ b/buildout.cfg
@@@ -36,8 -36,9 +36,8 @@@ south = 0.
  auf.django.skin = 0.15dev
  auf.django.auth = 0.5.2dev
  django-reversion = 1.3.3
- auf.django.workflow = 0.10dev
+ auf.django.workflow = 0.13dev
  django-ajax-selects = 1.1.4
 -
  #reportlab = 2.5
  #html5lib = 0.90
  #pyPDF = 1.13