Location button enabled
Merge branch 'master' of https://github.com/SoulandSoft/Entertainer