UI-429: work in progress on prompts
Merge branch 'master' into UI-429

Conflicts:
	whapps/voip/voip.js
UI-429: Added prompt menu to the voip module