Merge branch 'master' of https://github.com/winne27/leertipp

Conflicts:
	config.xml

Signed-off-by: winne27 <werner@schaeffer.net>