added code for ActivityViewController.m
resolved storybord merge conflict