Update branch
update for factory_girl
Update code
update code
Merge branch 'master' of github.com:luong-phuc-mulodo/RORR