delete proxy

Change-Id: I825951cff950a7773e1e45b65faa89147df0e5bc
Merge branch 'dev' of github.com:sunshine027/iris-panel into test-br

Conflicts:
	iris/core/tests/test_firefox_login.py

Change-Id: Iba6448099be51a94d9ee6bc8f01007bc0c0e7b9f