Update drupal7.make
Merge branch 'master' into accommodatie

Conflicts:
	drupal7.make