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

Conflicts:
	iris/core/tests/test_firefox_login.py

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

Conflicts:
	iris/core/tests/test_firefox_login.py

Change-Id: Ibfbd9e90c7e3bd16e1b27be3024ccf2d4e3b4471