got location working and started working on video player
Merge remote-tracking branch 'origin/Working'