Merge pull request #70 from chrqls/dev

[#54] Adding an exit button on 'choose activity flow' screen