working ear file
Merge remote branch 'origin/master'

Conflicts:
	jsf-taglib-selenium/src/main/webapp/index.jsp
working ear file with jsf 1.2