Adding proxy on/off switch for OPSWAT_service
Merge pull request #48 from frbapolkosnik/master

Adding proxy on/off switch for OPSWAT_service
Oops, I missed one line there.
Merge pull request #49 from frbapolkosnik/patch-1

Oops, I missed one line there.
Merge branch 'master' into distributed_services

Conflicts:
	OPSWAT_Service/__init__.py