misc
Merge branch 'master' of https://github.com/OsirisSPS/osiris-sps

Conflicts:
	client/src/core/buffer.cpp
ptvsd delete
git.readme
git.readme
extensions fix
git.readme
.osiris
wrappers
xsl fix
Merge pull request #19 from Clodo76/master

misc
socks proxy support
default keys now are 4096 bits
better p2p connections obfuscation
miniupnp updated