Merge branch 'default' into taoran
Merge branch 'default' into taoran
changed login of a verified member to match the simulator test
time account bug fixed
Merge branch 'default' into taoran
Merge branch 'taoran' into default
Enabled Google login button.
Merge branch 'default' into thibault