build model and contronller agularjs
fix conflict after merge code