Merge Field Plugins Bug Fixed

Updated the merge field plugin along with the  new menu and drag and
drop updates
Merge branch 'abdullah_1.4' into umair_

Conflicts:
	apps/bridgemail/templates/main_container.html