Merge branch 'master' of C:\Users\Tony\AndroidStudioProjects\AndroidWearApps\AirBand with conflicts.
Add fade transition when changing fragments (selecting an instrument to play)