CurrentEmployer cleanup
CRM-14165 - Remove placeholder where it's not wanted
CRM-10693 - Trigger events and support drupal wysiwyg in popups
Fix IM label
Address location type cleanup
Merge pull request #2613 from colemanw/employer

CurrentEmployer and select-list cleanup