old_app modifed

//sghong
 added below
   - wait and AF
//
Merge branch 'list'