test
test
test
test
Merge branch 'master' of https://github.com/furyegg/test-java

Conflicts:
	test-jsf/src/main/java/test/web/IndexBean.java
	test/pom.xml
	test/src/main/java/Test.java