composer fixes
Merge branch 'master' of https://github.com/robintema/LEMP into robintema-master

Conflicts:
	roles/dev.demo.json.dist
	roles/dev.local.json.dist