locale added through Cookies on template pages
Merge branch 'staging' of https://github.com/bedatadriven/activityinfo into staging