Merged WebDAV & seam-gui changes into master