temp commit
added updated button in viewActivityViewController
Merge pull request #14 from Event-Sync/NewActivityViewController

New activity view controller
Merge branch 'master' into keyboardAndOtherUI