Added deselect of stamp. Clicking on the same stamp twice will first select, then deselect it.
Merge commit 'c0c5804af5305f35d7359dfb76a0c509b85de05c' into PAINT_ON_CLICK