Nexmo test
Merge branch 'master' of https://github.com/EventSense/EventSense

Conflicts:
	server/app.js