Merge branch 'master' into Develop

cps/services/gmail.py

@@ -61,7 +61,7 @@ def get_user_info(credentials):
     return user_info.get('email', "")
 
 def send_messsage(token, msg):
-    log.debug("Start sending email via Gmail")
+    log.debug("Start sending e-mail via Gmail")
     creds = Credentials(
         token=token['token'],
         refresh_token=token['refresh_token'],
@@ -80,4 +80,4 @@ def send_messsage(token, msg):
     body = {'raw': raw}
 
     (service.users().messages().send(userId='me', body=body).execute())
-    log.debug("Email send successfully via Gmail")
+    log.debug("E-mail send successfully via Gmail")