cosmetics for settings-panel of items form
sev. mods
merge fixing
fixed merge conflicts
Merge branch 'content' of ../../repositories/git/iwyg_stage
fixed merge conflicts
refreshed git cache
Merge branch 'sozialized' of ../../repositories/git/iwyg_stage
Merge branch 'master' of ../../repositories/git/iwyg_stage
Merge branch 'master' of ../../repositories/git/iwyg_stage
Merge branch 'master' of ../../repositories/git/iwyg_stage
Merge branch 'master' of ../../repositories/git/iwyg_stage
Merge branch 'master' of ../../repositories/git/iwyg_stage
Merge branch 'master' of /var/www/htdocs/web43/files/rails/../repositories/git/iwyg_stage
Merge branch 'master' of ../../repositories/git/iwyg_stage
Merge branch 'master' of ../../repositories/git/iwyg_stage
Merge branch 'master' of ../../repositories/git/iwyg_stage
Merge branch 'master' of ../../repositories/git/iwyg_stage
Merge branch 'master' of ../../repositories/git/iwyg_stage
Merge branch 'master' of ../../repositories/git/iwyg_stage