cb-103: revised features & components
Merge pull request #12 from sugarcrm/cb-103

cb-103: revised features & components