Merge branch 'master' of https://github.com/onkelangil/PvC-app.git

Conflicts:
	daniel/app/src/main/res/layout/activity_call.xml
	daniel/app/src/main/res/values/strings.xml

Signed-off-by: unknown <salban_k@hotmail.com>
Fixed message found from old commit