Dev 2.0

Move 2.0 dev into main Jigoshop repository