instalka
Merge https://github.com/jgalka/aqua_drupal

Conflicts:
	.gitignore