Fix configuration
Fix Makefile
Merge ../weber-minimal

Conflicts:
	ansible/roles/webapp/templates/deployment_conf.yml.j2