Added Location stuff
Merge branch 'master' of https://github.com/GoogleJump/TheDreamTeam
Added location stuff