add trigger to create controversy tag set on insert
fix bug in warning message
Merge branch 'master' into RELEASE_20140325