Properties
Merge branch 'javaDoc'

Conflicts:
	src/protocol/XmppProtocol.java
	src/server/TCPServerSelector.java
Merge success
Funca Todo