Remove CSRF from demo, disable data cache
Merge branch 'master' into demo