calendar fixed
merging branches
Merge US76 and master