fix bug on create activity form
Merge remote-tracking branch 'origin/master'