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

Conflicts:
	test-jsf/pom.xml