Implemented support for the square geometry (no support yet for the mixer)
Merge branch 'master' of github.com:Fingerpaint/project-code

Conflicts:
	fingerpaint/src/nl/tue/fingerpaint/client/gui/CustomTreeModel.java
	fingerpaint/src/nl/tue/fingerpaint/client/storage/StorageManager.java
Merge branch 'master' of github.com:Fingerpaint/project-code
Fixes #43. An error window is now created asking the user to select a different geometry if the selected geometry is not the rectangle.
Made the toolselector modal, so that clicking outside it to close the popup panel doesn't make you draw on the canvas.
Merge branch 'master' of https://github.com/Fingerpaint/project-code
Fixed test cases for the simulator.
Merge branch 'master' of github.com:Fingerpaint/project-code
Fixed #7 by adding a no saves found message to all panels when the to be displayed list is empty.
Fixed warnings
fixed issue #40, changed the cancel button of comparePerformance to a close button
Merge branch 'master' of https://github.com/Fingerpaint/project-code
Fixed #37.

The code is now more consistent and makes - in my opinion - much more sense than before. A DrawingTool now simply fills "its shape" as large as possible into the given image.
Merge branch 'master' of ssh://github/Fingerpaint/project-code
Got rid of 'default' visibility of variables. This fixed some Javadoc warnings as well.
Fixes #33. Implemented that correct error messages appear, instead of the "If it doesn't work, the name is probably in use" from before. Error messages are now more detailed with support for localisation.
Merge branch 'master' of github.com:Fingerpaint/project-code

Conflicts:
	fingerpaint/test/src/nl/tue/fingerpaint/client/model/RectangleGeometryTest.java
gave all cancel buttons the cancel text again, also refactored the loading buttons
Merge branch 'master' of https://github.com/Fingerpaint/project-code
Fixed some Javadoc warnings.