Added functionality for specially displaying stickies
Resolving merge conflicts