updating in progress
seems like it works
fix directions
Merge branch 'master' into gmaps4rails_v2