added PKCS12 example class
Merge branch 'master' of https://github.com/ianopolous/Peergos

Conflicts:
	peergos/crypto/SSL.java
	peergos/storage/net/HttpsMessenger.java
	peergos/tests/Tests.java
	peergos/user/UserContext.java