OK
Merge branch 'master' of github.com:akuhlens/phone

Conflicts:
	Phone_Interface/Dialer.cpp