Profile and Tag Activities

[fthdgn]

The branch has conflicts. Before updating the changes it should be merged.

• Checkout this branch
• Click on origin/master on the branch list. Select merge
• It will show problematic files. Click merge for each of them. Create best combination.
• Be sure that there is no error.
• Push merge commit.
• The Pull Request will be automatically updated.