change on the view of the items to have correct options display
Merge branch 'BOXTOP-48-Display-product-options-on-basket' of github.com:photobox/boxtop-cms into BOXTOP-48-Display-product-options-on-basket
BOXTOP-323 removing i tags grrr
Merge remote-tracking branch 'origin' into BOXTOP-323-Final-Ui-Basket
styles for tablet updated
BOXTOP-323 fixing after merge
Merge remote-tracking branch 'origin' into BOXTOP-288-buttons-overriding-quantity-input

Conflicts:
	template-src/basket/js/basket.js
Maven profile name corrections
Merge pull request #57 from photobox/BOXTOP-288-buttons-overriding-quantity-input

Boxtop 288 buttons overriding quantity input
Merge pull request #56 from photobox/correct-maven-profiles

Maven profile name corrections
Merge remote-tracking branch 'origin' into BOXTOP-323-Final-Ui-Basket

Conflicts:
	template-src/basket/sass/skinny-inuit.css/boxtop/_basket.scss
Merge remote-tracking branch 'origin' into BOXTOP-329-layout-regressions-in-tablet-view

Conflicts:
	template-src/basket/js/basket.js
Merge remote-tracking branch 'origin/BOXTOP-323-Final-Ui-Basket' into BOXTOP-329-layout-regressions-in-tablet-view
BOXTOP-323 fixing merge issue on basket.js
updated duff merge
HOTFIX spacing issue on basket.js
Merge remote-tracking branch 'origin' into BOXTOP-323-Final-Ui-Basket
BOXTOP-323 new media queries and breakpoints
be work finished, just need a little fe fix
Added missing line