modified map js file
Merge branch 'Ren'
chopped images
push the button
fix on login
more changes as per junerey
Merge branch 'Ren'
Merge branch 'edbert'
add and edit