Merge branch 'start_unit_tests' of github.com:mozilla/browserid into start_unit_tests

Conflicts:
	browserid/static/dialog/controllers/dialog_controller.js
	browserid/static/dialog/resources/browserid-identities.js
	browserid/static/dialog/resources/browserid-network.js
	browserid/static/dialog/test/qunit/browserid-identities_test.js