Merge pull request #212 from jorgesilva/develop

Fixed beta build
Attempt fix for multiple Alert dialogs on BT scan & shield connection