Merge branch 'master' of github.com:ups100/TIN into DeamonIssues
overlapping daemon catalogues check
added remove thread method after failed connection to server
mutex added to daemon configuration writing - necessary ? i don't know
Changing Alias into State Machine. Almost done.
Merge branch 'DeamonIssues' of github.com:ups100/TIN
Should work find, list, remove operation. Meybe Pull in some case also,
but not Push.
Conflicts:
	code/Daemon/src/DaemonThread.cpp
alias id in daemon catalogue .file
Daemon thread added wait to server connection in destructor - core dump
avoider, but when server is off strange waiting for itself xd
Merge branch 'markubik' of github.com:ups100/TIN
Updating command parser
update
Merge branch 'master' of github.com:ups100/TIN into markubik
Update
Merge branch 'master' of github.com:ups100/TIN into Kj
ommiting .hidden temporary file DAEMON_CONFIG_FILE
working on client app
Merge branch 'Kj' of github.com:ups100/TIN into markubik
Update
Checking password works
some change in lua_tutorial
changes