asd
Merge branch 'master' of https://github.com/simoneik/SIP

Conflicts:
	bin/sip_client/SipClient.class
	bin/sip_server/SipServer.class
	src/sip_client/SipClient.java
	src/sip_server/SipServer.java