Updated formatting of java files
Merge branch 'master' of github.com:kevinzetterstrom/soundboarder-android