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

Conflicts:
	bin/sip_server/SipServer.class