New activities and buttons
Merge branch 'master' of https://github.com/c3luong/rbcChallenge