Merge branch 'release/v0.9'
Merge branch 'development'
google analytics AND CSRF *********AGAIN*************