merge in changes from https://github.com/michielbdejong/owncloud-owa.git