alerts push
Merge branch 'master' of https://github.com/PauliBuccini/meteor-push-server

Conflicts:
	server.js