Fix Token
Merge branch 'develop' of github.com:joshpc/Testosaurus into bugfixes/delete-category-child-persistence1