Merge branch 'master' of https://github.com/jitsi/jitsi-hammer

Conflicts:
	src/org/jitsi/hammer/Main.java
Merge branch 'master' of https://github.com/jitsi/jitsi-hammer

Conflicts:
	src/org/jitsi/hammer/Main.java