eclipse setting files
merge
proxy: added loading of public key