Add categories
Use a dropdown list for the categories on the addproduct page
Merge remote-tracking branch 'origin/master'