Merging files from Activity branch to master