csrf done
xml and jsp formatting
Merge branch 'feature/csrf' into develop