Owncloud 7
Merge branch 'master' of git://github.com/Da-Wei/dw-services

Conflicts:
	db/Dockerfile
	owncloud/Dockerfile
	owncloud/install.sh
	owncloud/nginx-owncloud.conf
	owncloud/php-fpm.conf
	owncloud/start.sh