update activity edit page settings
Merge remote-tracking branch 'Git_LM/master' into master1