Conflicts:
	ChangeLog
	resources/static/css/style.css
	scripts/browserid.spec

adding support for travis ci. 

Remove the extra space after the : in "Finish signing into:"

Changing the "pick email" string to "sign in"

issue #1189

issue #1179

issue #1185

Two changes:
- Fixing typo (comunicating, only one m)
- Using ' instead of '

Thanks @mathjazz - looks good.  r+

 /test now redirects to /test/ so that you can hit either url to run front end unit tests.  fixes backend unit tests. closes #1178

more rpm fixes: instead of pulling in all config/, just l10n-all.json

Adding more tests to make sure when the user sets a password, the min/max password lengths are checked.

disable /test at the app level in stage or production.

Adding more tests to make sure when the user sets a password, the min/max password lengths are checked.

* to testHelpers, add a generateString function which generates a string of the specified length.
* Replace the manual creation of strings for long passwords with generateString.
* To verify_email_address_test, adding checks for min and max length when setting the password.

issue #1173

adding support for travis ci. This will run on every commit and then a message to IRC to say if was successful or not

some rpm build fixes

Re-enable unchecking the "Always sign in using this email..." checkbox.

When the user successfully authenticates, log them in automatically with out going to the email picker.

Removing the href/target attributes from translated anchor tags.

Fix EJS adding global variables.

Fix the pick_email test failure when all tests are run.

Using @fawek's pull request as a base for a full solution.

* If the user clicks on the label, proxy the click event to the input element.
* If the user clicks on the input element, let the browser handle things.
* Add user tests to check clicks on both labels and input elements.

issue #1155

When the user successfully authenticates, log them in automatically without going to the email picker.

issue #198

Instead, translators will see a %s and the href and target attributes will be added dynamically.

issue #1160

Also call event.preventDefault() to ensure the native handler doesn't kick in.

issue #1157

The problem stemmed from the DOM was not completely reset between every test.  When the manage page inserted email addresses into its portion of the DOM, it added email addresses with elements with the same ID as the pick email controller.  Instead of ensuring we clean wipe these elements between every test, rely on QUnit's ability to reset a portion of the DOM to its initial state.

* Add the `qunit-fixture` class to the bit of DOM that should be reset between every test run.
* Add the testHelpers.setup/testHelpers.teardown functions to several suites that manually called emtpy() on DOM elements.

issue #1156

Fix for disappearing "keep me signed in button" after user selects an email address that has been deleted.

close #871