Merge branch 'dev' of https://github.com/lbinf/laradock into dev

# Conflicts:
#	.env
#	docker-compose.yml
#	nginx/sites/demo.conf

Merge branch 'dev' of https://github.com/lbinf/laradock into dev

# Conflicts:
#	.env
#	docker-compose.yml
#	nginx/sites/demo.conf