update
update
Merge branch 'master' of https://github.com/zhuchel/JSFPlayground

Conflicts:
	src/main/java/net/javabeat/primefaces/AutoComplete.java
	src/main/java/net/javabeat/primefaces/converter/PlayerConverter.java
	src/main/java/net/javabeat/primefaces/util/PlayerDataSource.java
	src/main/webapp/index.xhtml