Convergent settings page

git-svn-id: http://cantata.googlecode.com/svn/trunk@5267 b1e49159-3266-923f-9c3e-04f16369770a
Remove unnecessary lines

git-svn-id: http://cantata.googlecode.com/svn/trunk@5268 b1e49159-3266-923f-9c3e-04f16369770a