Add API JSON views
Add API JSON views
Irrelevant merge commit
Disable logging, fix authorized?
Merge changes from master back into API.
Merge API back into master