Added flatpages
Merge branch 'flatpages'