add drop down for multiple wishlists on add to wishlist
fix merge conflicts
Merge branch 'master' of https://github.com/mud-turtles-2014/GoBug