Merge remote-tracking branch 'origin/master' into DRIP_2.0

# Conflicts:
#	docs/composer_files/beia_docker-compose.yml

docs/playbooks/set_dockerhub_credentials2.yml

@@ -21,7 +21,7 @@
   - name: Add key
     apt_key: {url: 'https://download.docker.com/linux/ubuntu/gpg', state: present}
     become: true
-    register: result  
+    register: result
     
   - name: add repo
     apt_repository: {repo: 'deb https://download.docker.com/linux/ubuntu xenial stable', state: present}
@@ -46,8 +46,8 @@
   - name: Log into DockerHub
     docker_login:
       username: USER
-      password: PASS 
-      email: EMAIL
+      password: PASSS 
+      email: XXXXX
       config_path: /home/vm_user/.docker/config.json
     become: true