Update
Update
Update
Update
Update
Update
Merge branch 'dev' of git.simpledrupalcloud.com:simpledrupalcloud/docker-phpmyadmin into dev
Merge branch 'dev'

Conflicts:
	Dockerfile
	README.md