conflict resolved and merged search control and edtior

Conflicts:
apps/bridgemail/campaign.js
apps/bridgemail/main.js