commit for merge
conflict in LocationListFragment.java resolved
Downloading and parsing JSON data on startup