added mapp handling in steps 1,2,3
Merge remote-tracking branch 'origin/userdashboardmaps' into userdashboard