fixed gmaps4rails to show map WIP
fixed merge conflicts