Updated robot window with the new 'GenericWindow'
Merge pull request #178 from DavidMansolino/GenericWindow

Updated robot window with the new 'GenericWindow'