back button working in maps view
Merge branch 'backbtnmap' into development