Merge branch 'master' of https://github.com/asaayo/webapp.git
Location data and first maps available