Merge branch 'master' of https://github.com/luizfelipeairesoares/mapacriminal

Conflicts:
	criminalmap/criminalmap/DBOps/LocationOps.m
	criminalmap/criminalmap/ViewControllers/LocationViewController.m
	criminalmap/criminalmap/criminal_map.db
Resolvendo conflitos