added spinner initialisation and some renaming to the application state
Merge branch 'master' of https://github.com/Fingerpaint/project-code

Conflicts:
	fingerpaint/application/src/nl/tue/fingerpaint/client/Fingerpaint.java

fixed renaming conflice