Merge doesn't order messages by date

[xhujerr]

While merging messages, the second db is just appended. Currently whatsapp sorts the messages just by id, not by time. Thus the merge should take time into account.