Merge branch 'new_dev' of github.com:sunshine027/iris-panel into devel

Change-Id: Id863b4575878d5b5dbe7b75c41118be08385f919
Merge branch 'new-dev' of github.com:sunshine027/iris-panel into devel

Conflicts:
	iris/core/tests/test_firefox_login.py

Change-Id: If5d8a2e3b3edecf57c5d1882c0d378dfbe67d6b1