Refactored code to be simpler to understand
fixes issue #2667
fix an issue with dragitem on retina
Fixed occasional timing error in Selenium webdriver
Fixed issue #2703
Merge pull request #2796 from FinalAngel/develop

fixes issue #2667
Merge pull request #2798 from jrief/fix-issue-2703

Fix issue 2703