Added a map to MainActivity.java. You may need to install the
google-play-services_lib for it to work on your machine.
Merge branch 'master' of https://github.com/garciadece1/parking-app.git

Conflicts:
	android/NKUParkingLocator/.classpath
	android/NKUParkingLocator/AndroidManifest.xml
	android/NKUParkingLocator/bin/AndroidManifest.xml