Updated urls
Updated app-base template
Merged cc extras
Modified urls for django 1.6, trying to debug website-header view
merged conflicts
Continued to merge conflicts