Updated report templates
Merged master