Update friendly_id to version 5.0.4
Update geocoder to version 1.2.1
Merge origin/master