try to fix javascript
cosmetic fix discount
Merge branch 'dev' of github.com:lvl0nax/topaza