logging
huh?
Merge branch 'master' of https://github.com/mcdjw/sip-servlets.git

Conflicts:
	talkbac/src/oracle/communications/talkbac/CallFlow4.java