Create a new template partial, to combine the previous partials 'choosecalendar' and 'settings'

Issue #126
Update settingswrapper to make use of unified template, choosecalendar and settings)

Issue #126
Merge branch 'master' into fix-settingswrapper.php
update settings dialog
Merge branch 'fix-settingswrapper.php'