Merge pull request #57 from vikramrajkumar/btsx

upstream updates
fix alert flashing
Update submodules
Merge branch 'develop' into btsx
Update submodule