rebase from remote
commit for rebase
Incomplete - task : TaskFolder Activity , new activity
Incomplete - task : TaskFolder Activity, modify code