Swapped default to be basicWeek to work around the basicDay loading issue.
Merge branch 'feature/281'
Merge branch 'master' into test