Merge pull request #107 from stevendgonzales/master

Added Token to tenant object model, and updated tenant resources and unit tests
Merge remote-tracking branch 'upstream/master'
changes for third cache, additions to token class, additions to tenant utils