Port to SDL2
Merge branch 'master' into gui
Removed SDL from test target