draggable view changes
Merge remote-tracking branch 'origin/master' into mainscreen1
finished draggable view
Merge branch 'mainscreen2' into master2
Merge