- Fixed button click not going to activities
Merge branch 'paul'