Remove location from model and put back js modified by @rizarsyi
Merge pull request #56 from rolies106/master

Remove location from model and put back js modified by @rizarsyi