Fix Create in SearchDialogProxy
EmailTemplate fix: ckEditor freezes when changing text in Html Source
Merge remote-tracking branch 'origin/master' into bootstrap