Added 2 reports, Corrected calendar and dashboard
Merge origin/master