fix bug
Merge branch 'develop' of https://github.com/buttleofx/ButtleOFX into develop
Merge branch 'develop' of https://github.com/buttleofx/ButtleOFX into dev_menu
Fix Modal pop up window #57