Reset to 90840b1bd32a5bd06a2cee383bff6522c7697b4e
Merge remote-tracking branch 'origin/master' into 3.0-master

Conflicts:
	OpenFaces.ipr
	openFaces/source/META-INF/resources/openfaces/select/tabset.js
	openFaces/source/org/openfaces/component/panel/TabbedPane.java
	openFaces/source/org/openfaces/renderkit/select/TabSetRenderer.java