Merge branch 'release/20130121' into develop
Merge branch 'hotfix/20130122' into develop
enable flatpages middleware again
flatpages template with markdown and urlize filters applied to content
Measure creation important template forgotten whoops
Merge pull request #108 from haaksmash/feature/108-policy-flatpages

Flatpages: Let's get them up to hold flat stuff.
Merge remote-tracking branch 'canon/develop' into develop
bumping release version
Merge branch 'release/20130123'