added ellipse and rectangle tool-classes. fixed bugs
Merge TFS Changeset 1615