First commit. Activities created.
Merge branch 'origin/master'