'Merge' branch desktop into master
'Merge' branch desktop into master
"Merge" branch laptop into master
fixed merge
various changes