Merge branch 'sf2.4' into sonatauser
added list_tostring template
Merge branch 'sonatauser' into i18n
removed some overhead