minor modifications to base map model
Merge branch 'master' of https://github.com/matmar10/angular-phone-gap-poc

Conflicts:
	assets/app/scripts/controllers/controllers.js
	assets/app/views/map.html
remove .jars from ignore list