to merge
Merge branch 'master' of https://github.com/micoli/ccphone.git

Conflicts:
	src/main/java/org/micoli/phone/ccphone/AsyncEventManager.java