fix expanded choice pagepart
Merge pull request #7 from Kunstmaan/fix_choicepagepart

fix expanded choice pagepart
parse namespace
fix template
Default site fixtures tweaks
Merge branch 'master' into 2.2