XSRF added
XSRF added
Merge pull request #1095 from riande/working_15_feb

Working 15 feb