Merge pull request #317 from ThePlayground/master

Right stick mapping options, Logging fixes, Menu notices