Added moar events
Merge branch 'master' of https://github.com/SC5/devicewall

Conflicts:
	server.js