Probable fix of #1 ticket
Merge branch 'alto'

Conflicts:
	atuser/plugin.xml
bugfix charset