Merge pull request #15 from chandaraprakash/master

Player and Location Views