Get Activity Groups from the API
Partial merge implementation and small fixes
Merge confirmation Dialog
Initial activity records merge to create a new activity
TODOs for merge saving completion

----
Button to enable activity link edit
Get Activity Groups from the API
Use activity groups with the new structure
Merge pull request #108 from SmokyBob/issue106

Use the Activity Group API in the front End
Merge remote-tracking branch 'maiera/feature/material_design' into feature/material_design