map View added
Merge branch 'Map_mapActivity' into working

Conflicts:
	project.properties