Merged requested to merge SamsungGalaxyPlayer:master into master
Created by: SamsungGalaxyPlayer
This time, the images and formatting is correct to my knowledge (thanks ajs!).
Some of the commits, listed below, involve adding and deleting the same file. I do not know how to remove these from the pull request. My apologies:
8892a73f 7033bb71 18bb2059 789c9e93
Thus, the two commits to worry about are: