update
Merge branch 'master' of https://github.com/Judahh/RTPhone

Conflicts:
	RTPhoneClient/build/built-jar.properties
	RTPhoneClient/build/classes/remoteMethodInvocation/Client.class
	RTPhoneClient/build/classes/view/ChatTabPanel.class
	RTPhoneClient/build/classes/view/MainWindow$1.class
	RTPhoneClient/build/classes/view/MainWindow$2.class
	RTPhoneClient/build/classes/view/MainWindow$3.class
	RTPhoneClient/build/classes/view/MainWindow$4.class
	RTPhoneClient/build/classes/view/MainWindow$5.class
	RTPhoneClient/build/classes/view/MainWindow$6.class
	RTPhoneClient/build/classes/view/MainWindow.class
	RTPhoneClient/dist.zip
	RTPhoneClient/dist/RTPhoneClient.jar
	RTPhoneClient/dist/lib/RemoteMethodInvocation.jar
	RemoteMethodInvocation/build/built-jar.properties

	modified:   RTPhoneClient/build/built-jar.properties
	new file:   RTPhoneClient/dist.zip
	modified:   RTPhoneClient/nbproject/private/private.properties
	modified:   RTPhoneClient/src/view/MainWindow.java
	modified:   RemoteMethodInvocation/build/built-jar.properties
	modified:   RemoteMethodInvocation/nbproject/private/private.properties