api key support
Merge branch 'master' of github.com:TrailSafe/server