Merge manhour/manage and manhour/grantall