Fixed syntax errors from xhtml :)
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/pages/index.xhtml
Merge remote-tracking branch 'origin/master'
Refactoring jsf configuration.