fixed maps and naming convention
Merge branch 'master' of https://github.com/nickzarzosa/ideasofmarch2014team6

Conflicts:
	src/monterey_housing/ideasofmarch2014team6/MainActivity.java