Bugfix. Time on old messages shown incorrectly.

Also other backports from production.
Merge branch 'master' of github.com:jcbrand/converse.js

Conflicts:
	converse.js