refine trusted html rules again
Merge branch 'master' of https://github.com/h920526/jaBenDon.git

Conflicts:
	src/main/webapp/scripts/filter/html-tag-filter.js