revert commit
[keymap] little change
[language] update de.po
[imagebackup] fix axodin backups
Merge branch 'master' into beta

Conflicts:
	configure.ac