Merge pull request #150 from gioman/master

Training calendar updates