add time to note and note layout
Merge remote-tracking branch 'origin'