New Fragment for map
Merge remote-tracking branch 'origin/master'