fixed missing csrf check
Merge branch 'develop' into testing