Merge pull request #1 from jigoshop/dev

Merge pull request #976 from KrzysztofBorbis/master
added possibility to decide to show price with tax
improved code
Merge pull request #977 from KrzysztofBorbis/master

added possibility to decide to show price with tax