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
[tx-robot] updated from transifex
Cast translated displayname to string in CalDAV bday calendar
Merge pull request #163 from owncloud/string-cast-displayname

Cast translated displayname to string in CalDAV bday calendar
Merge branch 'master' into fix-settingswrapper.php
update settings dialog
Merge branch 'fix-settingswrapper.php'
Merge branch 'master' into visitha-my-feature-branch