Rewrote properties loading and added overriding of properties
Merge branch 'master' of https://github.com/tibistibi/mTorClient.git