Add in new activity for second screen
Merge remote-tracking branch 'origin/master'