Sam/marketing api#77

samholmes wants to merge 2 commits into

masterEdgeApp/edge-push-server:masterfrom

sam/marketing-apiEdgeApp/edge-push-server:sam/marketing-apiCopy head branch name to clipboard