Add json token authentication and test
Merge branch 'master' into KMSEdits

Merging master into changes.
Merge pull request #7 from ChartKillers/KMSEdits

Authentication and testings