Increase sleep time in test_delete_group test, to try to help Travis.
Merge branch 'release-0.12.0' of github.com:learningequality/ka-lite into release-0.12.0
in delete button tests: make sure teacher is part of facility
use an updated version of firefox for travis
Adds wait for alert_is_present on generic method for accepting
modal dialogs.

Conflicts:
	kalite/testing/browser.py
simplify test_delete_facility test
simplify test_delete_group test
metadata for 0.12.6
Merge pull request #2353 from learningequality/release-0.12.0

Release 0.12.0 to Nalanda RCT 2
Merge branch 'nalanda-rct2' of github.com:learningequality/ka-lite into nalanda-rct3

Conflicts:
	kalite/control_panel/tests/control_panel.py
	kalite/testing/browser.py