added custom listview
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	project.properties
	src/com/example/test_android/google_map.java
	test_android.iml
newest commit added google maps Json parse