Conflicts:
	Makefile

Strophe.log and .error now calls converse.log, this honors converse.debu...

jquery.browser >=0.0.7 from master repo

This closes issue #299, Update to latest jquery.browser as pointed
out by @le717

Added new Makefile.win, it only has dev/build/check targets

Add Makefile.win example
Add Chocolatey references + required packages

Gruntfile now appends .cmd extension to r.js if platform is win32
Made touch-npm/bower grunt task/targets
make -f Makefile.win to build on Windows

We now no longer need the step of pasting the json code into a standalong .js
file.

Also, moved locales.js to ./src folder.
Add it as dependency to utils.js and remove it from the deps scripts

instead of having to create a .js file with translations.

Polish translation of version 0.8.6.

Conflicts:
	docs/CHANGES.rst

Also, fixed all broken tests.

- Don't add a timeout for the GONE state.
- Change state to GONE when the user closes the chat box.
- Change the state to inactive when the user minimizes the chat box.
- Change the state to active when the users maximizes the chat box.
- Add more tests for chat states.

Merge branch 'add-allow-registration-doc' of https://github.com/gbonvehi/converse.js into gbonvehi-add-allow-registration-doc

Conflicts:
	docs/CHANGES.rst

Add fullname and jid to contact's tooltip in roster

It seems title attributes are limited to 512 chars, we will have
to live with that unless a custom tooltip is used.

Converse.js will now send chat state notifications of <paused>, <inactive> and
<gone> when the user has stopped typing for 30 seconds, 2 minutes and 10 minutes
respectively.

removes need to modify index.html all the time.