bugfix on announcement_view form save
Merge branch 'master' into kingman