Merge pull request #4 from strootman/DesktopRewrite

CORE-5415, CORE-5416: de-webapp module refactor
CORE-5415: Corrected window cycling logic