merge
fix missing review model and view
resolve conflict
Merge branch 'master' of github.com:seungjoolee/ForwardTutoring