Added map to activity form
Improved involvement in activity form
Small bugfix on gridview
Merge branch 'feature/form' into develop