Add categories and location mapper.
Merge branch 'master' of https://github.com/lelexxx/MooveIntoMyCity