public static preferences + clickable Shapes
Revert "public static preferences + clickable Shapes"

This reverts commit 26bdc2fa93b1bd04586030130bdbd3697dddd683.
Revert "Revert "public static preferences + clickable Shapes""

This reverts commit fabf32591146bb80c611bc09ffc49f7d4f813251.
Mediator Class added
Merge remote-tracking branch 'origin/groups'