Added getTypes function
 Updated getTypes to return name, displayName and customCssClass
Merge branch 'master' into 10KContacts