re-merged category controller file with some un-committed changes from server