Merge branch 'master' of github.com:ups100/TIN into Kj

Conflicts:
	code/Daemon/include/DaemonThread.h
	code/Daemon/src/DaemonThread.cpp

FileLocation modification
Identifier class added
Identifier forgotten files xD
default parameter 4 client
changes
Merge hopefully successfull
cleaning