The demo site was not kept up to date with the recent changes in Oscar
due to time contraints. It should be moved to a separate demo repository
in the future.

Have tested on sandobx site seems all working,
not sure if you need more testing on it.

Fixes #1541.

This is the squashed version of #1369.

Closes #1369.

I struggled, so I thought I'd document it.