clon
1
1
jsf conf
Merge branch 'master' of github.com:RVRhub/compiler

Conflicts:
	Compiler/lib/jstl-api-1.2.jar
	Compiler/pom.xml
	Compiler/src/main/resources/com/example/test/dao/AccountDAO.java
	Compiler/src/main/resources/com/example/test/dao/hibernate/DBUtilsHibernate.java
	Compiler/src/main/resources/com/example/test/dao/hibernate/OracleAccountHibernateDAO.java
	Compiler/src/main/resources/com/example/test/dao/impl/DBUtils.java
	Compiler/src/main/resources/com/example/test/dao/impl/OracleAccountDAO.java
	Compiler/src/main/resources/com/example/test/dao/impl/OracleDirectionDAO.java
	Compiler/src/main/resources/com/example/test/dao/impl/OracleProjectDAO.java
	Compiler/src/main/resources/com/example/test/entity/CreateEntyt.java
	Compiler/src/main/resources/com/example/test/entity/GenericAccountInfo.java
	Compiler/src/main/resources/com/example/test/entity/GenericProjectInfo.java
	Compiler/src/main/resources/com/example/test/web/servlets/LogIn.java
	Compiler/src/main/resources/hibernate.cfg.xml
	Compiler/src/main/webapp/WEB-INF/classes/hibernate.cfg.xml
	Compiler/src/main/webapp/WEB-INF/lib/jstl-api-1.2.jar
	Compiler/src/main/webapp/WEB-INF/web.xml