merge trunk
Changed base url
[IMP] now always uses the /web url to display the web client instead of / . / now redirects to /web