sync with origin master
solve conflicts with repo.
Merge branch 'master' of https://github.com/jamiri/protorails
Merge branch 'master' of https://github.com/jamiri/protorails
solve merge conflicts