Replace custom JSON views with API calls
Merge branch 'master' into django1.6
Fix double new lines at end of file
Remove JSON representation of public body, fix API test