Added category management and category selection in product view
Merge branch 'dev'