Merge ewmailing javascript branch