error messages, and object classes modified, firm reference field working
same as before with files now
Merge branch 'victor'

Conflicts:
	SWE2_Client/src/proxy/Proxy.java
	SWE2_Server/bin/.gitignore