All empty fields are now by default "-".
Client and Server Txn identifiers are now being generated by using the
source and destination IP addresses to check for forking.
Merge branch 'master' of https://github.com/oaboyko/SIP-CLF

Conflicts:
	updatedCapturer.java