Feature #6232
Feature #6229... again
bug fix with note, text edit on welcome page, beginnings of date/time picker change
merge with master