Added service and undebugged telephony listener hook
.gitignore merging errors fixed