Rails4

Update master to rails 4