ready for demo
Listview and timings of each masjid remaining

Conflicts:
	VolleyWrapper/res/layout/map.xml
	VolleyWrapper/src/com/example/volleywrapper/MainActivity.java
dadasdas
asasdasd
Merge branch 'b_gps' of github.com:veriqual/Masjid-app into volleybranch
merging b_gps and volleybranch

Conflicts:
	VolleyWrapper/res/.DS_Store
	VolleyWrapper/res/layout/custom_info_window.xml
	VolleyWrapper/src/com/example/volleywrapper/CustomInfoWindowAdapter.java
	VolleyWrapper/src/com/example/volleywrapper/DetailTimings.java
	VolleyWrapper/src/com/example/volleywrapper/ErrorListener.java
	VolleyWrapper/src/com/example/volleywrapper/MainActivity.java