Fixed a bug in backup of files
Added tox to presets
Updated package
Merge bugfixes and additions to resetsettings.xml

Conflicts:
	resetsettings.xml
	resetsettings_UNSTABLE.deb