Added Popup modals for incoming calls
Merge branch 'socket.io_refactor' of https://github.com/xlagunas/video2browser

Conflicts:
	app/views/mail.html
Merge branch 'socket.io_refactor' of https://github.com/xlagunas/video2browser

Conflicts:
	app/views/mail.html
Added contact search