Squashed 'yoink/' changes from eea5db7..7d960e3

7d960e3 moved shapes.js into icontrib

git-subtree-dir: yoink
git-subtree-split: 7d960e357ca3ef73fbc9c4ed90da11ea4e6a5961
Merge commit '6688d7aef5f503b2f9e4791ca32dd4b7cc8f1a13'
moved shapes.js from yoink to skin/