Some of the tests were failing because they didn't expect the controlbox to be
returned from localStorage.
It's too long ago that I've looked at this branch for me to say whether this is
a legitimate bug or not.
Will have to investigate further.

* Use phantom-jasmine instead of jasmine-reporters
* Update Makefile to use the test runner from phantom-jasmine
* Use newest phantomjs
* Use latest bower
* Turn of jquery effects when testing

Conflicts:
	docs/doctrees/index.doctree
	docs/html/_sources/index.txt
	docs/html/index.html
	docs/html/searchindex.js

Conflicts:
	docs/source/index.rst

Conflicts:
	CONTRIBUTING.rst

Conflicts:
	CONTRIBUTING.rst

Instead of having to build it manually in a Grunt/Makefile step.
Clean up the Makefile a bit as well.

* Save controlbox to containing collection
* Call refreshWebkit after closing controlbox

Conflicts:
	bower.json
	converse.js
	docs/CHANGES.rst
	spec/chatbox.js
	tests/utils.js
	tests_main.js

message counter for minimized chats

- use the same method for both normal and OTR messages
- fix /me actions for OTR messages
- rename messaging methods to minimize ambiguity

Conflicts:
	converse.js
	tests/utils.js

- use the same method for both normal and OTR messages
- fix /me actions for OTR messages
- rename messaging methods to minimize ambiguity

Also dropped the minimum height restriction

... and remove dragresize stuff from the mockup