nambah menu edit activities
Merge branch 'nambah-edit-activity'