Merge pull request #50 from tugelbend/develop

Develop
Merge pull request #51 from tugelbend/develop

Removed keystone library as we don't need it, added settings for framexl...
Merge pull request #52 from tugelbend/develop

Made the buttons bigger
Merge pull request #53 from tugelbend/develop

Added setting for using a different camera device on linux, added cross ...
Merge pull request #54 from tugelbend/develop

Change mapping of x position to work on rear projection screens
Commented a bunch of debug prints + added blobSize variable (not used yet) + References for homography
Merging changes from Hauke
Merge pull request #55 from SableRaf/develop

Homography prototype and merging latest changes from Hauke
Homographic prototype (WIP) + Capture positionning for 16:9 + Additions to the settings file

Note: Capture positionning for 16:9  introduced a bug in the blob
tracking (the Y axis is squished). Will fix now.
Added options to switch between 4:3 and 16:9 in settings.properties
Merge pull request #56 from tugelbend/develop

Develop
Added robot mouse for blob-based cursor control
alwaysUseMouse=false
Merge upstream
Removed mergetool conflict comments
Merge pull request #58 from SableRaf/develop

Cursor control from the can (and more)
Removed mergetool backups + added new sprayMaps
Cropping now always works in 4:3, even in 16:9 mode

Should fix blob vertical squishing
Fixed blob vertical squishing
Merge pull request #62 from SableRaf/develop

Develop