Feature/upgrade rails

upgrade rails to 4.1.6