First commit.
Merge branch 'master' of github.com:Adirelle/SharedMedia_ButtonHighlight