Added auto-layout to painDrawing view and functionality for marking dates in the diary.
Merge remote-tracking branch 'github/master'