begin 0.6-SNAPSHOT
added back proxy and ssl support
release 0.6
Merge branch 'develop'