Changed description
Merge branch 'master' of github.com:sipgate/demo.sipgate.io

Conflicts:
	server.js