tests
Merge branch 'master' of https://github.com/micoli/ccphoneUI

Conflicts:
	src/main/java/org/micoli/phone/ccphoneUI/CallUI.java
	src/main/java/org/micoli/phone/ccphoneUI/Main.java