Merge pull request #293 from soul-rebel/tokens_controller_instrumentation

added ActionController::Instrumentation in TokensController
Fix mock and stub deprecation warnings.
Fix mock and stub deprecation warnings.
Merge pull request #294 from ianunruh/master

Changed generation behavior on Application creation
Removed client from password credentials grant