Move csrf into development
Remove Google+ oauth
Fix csrf token mismatch