merge message
Merge remote-tracking branch

Conflicts:
	forumvi.chatbox.css
	forumvi.chatbox.js
new style