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