Merged owncloud and owncloud-ctl