Rails4 rebase

testing