Syncing with git

Product/Category/user controllers, some database changes