Clear Bango cookie on new SIM (bug 872751)
add in CSP (bug 849892)
Merge pull request #258 from andymckay/849892

don't merge, just parking (bug 849892)
Bumping funfactory version from 2.1.1 to 2.2.0 (bug 871860)
Merge pull request #270 from davidbgk/871860-upgrade-funfactory

Bumping funfactory version from 2.1.1 to 2.2.0 (bug 871860)
Adding appconf dependency (rel 871860 PR#270)
Manual merge from master
Merge pull request #271 from davidbgk/871860-upgrade-funfactory

Adding appconf dependency (rel 871860 PR#270)
Explicitly adding jingo_minify app (rel 871860 PR#270 PR#271)

In order to get access to the `compress_assets` command used in
deployment.
Merge pull request #272 from davidbgk/871860-upgrade-funfactory

Explicitly adding jingo_minify app (rel 871860 PR#270 PR#271)
Merge pull request #269 from kumar303/sim-logout

Clear Bango cookie on new SIM (bug 872751)
Turn on Bango to test bug 872751
Revert "Turn on Bango to test bug 872751"

This reverts commit aad4c263793a13b56531c387a166c584d690590f.
Explicit STATIC_URL for test settings (rel 871860 PR#270)

Otherwise jenkins build fails.
Merge pull request #273 from davidbgk/871860-upgrade-funfactory

Explicit STATIC_URL for test settings (rel 871860 PR#270)
maybe fix compress_url error in tests
Prepare local development for non https cookies
Explicitly declare all apps used.

Funfactory has some apps that we don't need
so this ensures we don't pick them up on upgrade.
Merge pull request #274 from kumar303/custom-apps

Explicitly declare all apps used.