Update Metric_fu version
Merge branch 'master' of https://github.com/jlopezm82/sample_app_rails_4-master
Fix conflic