回滚
继续回滚
Merge branch 'fix/development' of
https://github.com/fixteam/webtools.jsf.git into fix/development

Conflicts:
	jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/AbstractTagCreator.java