Added from branchFromMaster 02/12/2014 #1
Merge pull request #14 from hans-sugarcrm/branchedFromMaster

Added from branchFromMaster 02/12/2014 #1