activities
add merchant activity CRUD
Merge branch 'activities'