fixed issue#45, issue#47, issue#51. change the layout of composite, don't use contact instead of folders list

git-svn-id: https://svn.apache.org/repos/asf/james/hupa/trunk@1522333 13f79535-47bb-0310-9956-ffa450edef68