hooked up sockets/webhooks
Merge branch 'master' of https://github.com/SAMdesk/sam-apps

Conflicts:
	.gitignore