settingsblock view now uses settingswidget
Merge branch '2.1' of https://github.com/SamMousa/LimeSurvey.git into 2.1