New Activities, functionality, etc
Merge remote-tracking branch 'origin/master'