#1
Merge remote-tracking branch 'master/master'

Conflicts:
	src/vmdeep/chatlists/chat/Message.java
Merge remote-tracking branch 'master/master'

Conflicts:
	src/vmdeep/chatlists/chat/Message.java
Merge remote-tracking branch 'master/master'