Updated dependencies
Merge branch 'master' of github.com:Anephenix/poller

Conflicts:
	package.json