category view toggle bug fix
jquery confilict problem solved
Merge branch 'master' of github.com:pooya1366/jk