Merge branch 'master' of https://git.epfl.ch/repo/genomeprivacy

Conflicts:
project/Client/war/WEB-INF/classes/FrameWork/DBconnector_mu.class
project/Client/war/WEB-INF/classes/crypto/KeyGenerator.class
project/GenomicPrivacy(android)/GenomicPrivacy/bin/classes/FrameWork/DBconnector_mu.class
project/GenomicPrivacy(android)/GenomicPrivacy/bin/classes/com/example/genomicprivacy/InfoPatient$getHashMap.class
project/Server/bin/FrameWork/ClientWorker.class
project/Server/bin/FrameWork/LoginDB.class
project/Server/bin/FrameWork/Request.class
project/Server/bin/FrameWork/Type.class