CAL-729 No icons on recurring events
cs injection on 20140410-101827
lt injection on 20140410-101827
Merge commit '2f6e9f8ab0f856dcd168cf7dd06c3f91f59a6a0a' into HEAD
Merge commit 'd0b6411587c9ba1805547cb471d0fa65ab70eab9' into HEAD