users+authentication+gcal import
Merge remote-tracking branch 'origin/master'