Completed hSquare and fSquare tools

-- Renamed tTool.circle to tTool.shape, since it's now used by the
square aswell.