merge ownCloud 6 and 7 code