test
test1
Merge branch 'master' of https://github.com/smartSocialNetwork/faceCrypt

Conflicts:
	Main/.classpath
Merge branch 'master' of https://github.com/smartSocialNetwork/faceCrypt
Merge branch 'master' of https://github.com/smartSocialNetwork/faceCrypt
cache manager