Starting refactoring the GUIs
Merge remote-tracking branch 'origin/iteration3' into iteration3

Conflicts:
	database/ClientSystem.properties
	database/ClientSystem.script
	src/cis/buisness/Client.java