Merge branch 'master' of https://github.com/mmorehea/LaunchPad3.git