Fix Last Month and Last week graphs. Closes #1853
Fix invalid date error. Closes #1850
Updated version and changelog
Fix merge conflict