Merge branch 'master' of github.com:ups100/TIN into Kj
Merge branch 'master' of github.com:ups100/TIN into Kj
client app list local files
listing canges
Merge branch 'master' of github.com:ups100/TIN into Kj

Conflicts:
	code/Client/src/ClientApplication.cpp