Merge branch 'swaggerlikeus' of ssh://bitbucket.org/yackob03/quay into swaggerlikeus

Conflicts:
	test/data/test.db

data/database.py

@@ -291,6 +291,7 @@ class OAuthAuthorizationCode(BaseModel):
 
 
 class OAuthAccessToken(BaseModel):
+  uuid = CharField(default=uuid_generator, index=True)
   application = ForeignKeyField(OAuthApplication)
   authorized_user = ForeignKeyField(User)
   scope = CharField()