Integrated flatpages app for About page
Merge branch 'flatpages'