Refactor pass1 on AgileProjectActivity
Merge remote-tracking branch 'origin/master'