Merge pull request #9 from AdamPapros/master

Refactoring: project splitted to subprojects:
Removed duplicate sql file. Closing socket on remove
Merge closing transport
Fix merge bug
Deployment scripts for VMware Ubuntu Server 14.04
Loadin properties file
WIP: replication; getIntegerIpfromString
Major changes. Variable IP, not only localhost! Normalisation of types: IP is now String(not integer), fileID is Integer (there were mixed Integer and Long issues). Changed and regenerated rso.thrift normalising and adding new server methods/changing interface for example to include slaveIP in request. Changes in DAO due to normalisation.Modified script not to insert test files. New client interface: put and get take 2 params: source and destination. Client now have variable masterIP given in commandline param as compared to earlier hardcoded one. DFSClosingClient for try-allocate resources java idiom.
Restore .project files removed by mistake
VMware: first successful deployment: Master VM1, Slave VM2, Client RealM, no hardcoded IP adresses. Updated README and deployment scripts
sql view with free memory on server
update status
Obsluga konfiga
WIP: replication #2
Merge branch 'master' of https://github.com/nme01/SKM
Clean up.
mhm
pre LS command
ls implementation
Merge branch 'master' into feature-repository

Conflicts:
	dfs-server/src/main/java/rso/dfs/model/dao/psql/DFSDataSource.java
	dfs-server/src/main/java/rso/dfs/model/dao/psql/DFSRepositoryImpl.java
	dfs-server/src/main/java/rso/dfs/server/DFSServer.java
	dfs-server/src/main/java/rso/dfs/server/ServerHandler.java