no
Merge branch 'master' into asasBranch
fixes conflict
finally gets dayview working in a new way