Merge branch 'master' of github.com:jcbrand/converse.js

Conflicts:
	CONTRIBUTING.rst

CONTRIBUTING.rst

@@ -20,6 +20,7 @@ Before submitting a pull request
 
 Add tests for your bugfix or feature
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 Add a test for any bug fixed or feature added. We use Jasmine
 for testing. 
 
@@ -27,6 +28,7 @@ Take a look at ``tests.html`` and ``spec/MainSpec.js`` to see how
 the tests are implemented.
 
 Check that the tests pass
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Check that the Jasmine tests complete sucessfully. Open tests.html in your
 browser, and the tests will run automatically.