Added CORS headers to settings
Fixed imports and formating in tokenAuth and views
Merge branch 'api-test' of https://github.com/keymholio/ux-army-api into api-test