update deleted files
Merge branch 'master' into fixing_type
fixed activity creation specs