rails 4

merge changes for rails 4