removed map_old_file
comitting for heroku test
added cosimo's work fixing the info window click issue
merge master