Added option to wish for an item in its container to the wish menu. Thanks to jwo(lotsofsevens) for the idea. Closes #415
Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA