Master

merge with upstream code, add 2 custom images to sogou skin