Merge new-ui-branch into the trunk.
drwxr-xr-x - camel
drwxr-xr-x - libedataserver
drwxr-xr-x - libedataserverui