merge rails dev branch to master