Activity Creation Stuff
Merge remote-tracking branch 'origin/master'
Added activity creation functionality
Merge remote-tracking branch 'origin/master'