updated base activity
 Fixed base activity setup to include snag activity listener
Fixed merge conflict
R file changes