1
Merge branch 'wx' of github.com:librajt/temp into gh-pages

Conflicts:
	wx/js/shop.min.js