empty
fix conflicts
add google client
Merge branch 'master' of github.com:oss-fruct-org/gets
add userLogin method