Reorganize template sections
Merge branch 'master' into foundation
Upgrade to Django 1.7
Merge branch 'master' into foundation