merged with Eggz changes
fixed problems caused by merge
added support for drawing scaled lines and circles
normalised circle and rectangle for UI elements
scaling mouse positions