Merge branch 'master' into raysmond
new/edit cateogry functionalities.
Merge branch 'raysmond'