use auth and content-server train-22
Merge pull request #62 from jrgm/update-train-22

use auth and content-server train-22