minor commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	GoogleCalAuthenticationToken_New
	Username
	log