Cleanup
Merge branch 'master' of https://github.com/syncloud/owncloud-setup
build-image.sh script added to root level