New environment variable DRUPAL_VERSION to choose which version of drupal you want (7 or 8)
Merge branch 'master' of https://github.com/Boran/docker-drupal

Conflicts:
	TODO.md