Finish create activity form.
Merge remote-tracking branch 'origin/master'