Fix for default dates
Work on layouts and package info for subs
Merge branch 'newdev' into edina