fixed google login error in session_controller
Merge branch 'development' into oauth