Merge branch 'master' into journal
new entry date logic fix
Merge branch 'journal'