"Fixed the location details activity"
Merging maria and master