removed swap
message bugfixes all good
Merge branch 'master' of https://github.com/jmfurlott/flare_backend into oauth-passport