Fixes and formatting.
Merge branch 'pullingSecondBranch' of https://github.com/icowley/allplayers-android into A1.1
Fixed an issue that occasionally could cause a crash.