update
Merge branch 'master' of https://github.com/Internship-AURIS/Project-AURIS

Conflicts:
	desktop/userdata.json
added new Preferences in preferences.cfg
update