rails4 initial changes
solving diffs