fixed popup for adding qty greater than stock. Added drop down for category
Merge branch 'master' of github.com:zhihaoli/304Project