ready to go
ready to go
Merge remote-tracking branch 'origin/master'

Conflicts:
	dbscript/bootstrap.sql
	pom.xml
	src/main/java/com/oruxa/isp/dto/model/CvInfo.java
	src/main/java/com/oruxa/isp/server/businessLogic/Experts.java
	src/main/java/com/oruxa/isp/server/businessLogic/Faculties.java
	src/main/java/com/oruxa/isp/server/dao/TestMapper.java
	src/main/java/com/oruxa/isp/server/guice/MyBatisGuiceModule.java
	src/main/java/com/oruxa/isp/server/servlet/TestServlet.java
ready to go
testing MYBATIS associations