code at home
Merge branch 'master' of github.com:yaohuiwu/learning-java

Conflicts:
	project/learning-spring/src/main/java/org/learning/spring/hello/controller/CompanyController.java
	project/learning-spring/src/main/java/org/learning/spring/hello/dao/hbn/CriteriaInvocationHandler.java
	project/learning-spring/src/main/java/org/learning/spring/hello/dao/hbn/QueryInvocationHandler.java
	project/learning-spring/src/main/java/org/learning/spring/hello/dao/hbn/SQLQueryInvocationHandler.java
	project/learning-spring/src/main/java/org/learning/spring/hello/dao/hbn/SessionInvocationHandler.java
	project/learning-spring/src/main/java/org/learning/spring/hello/dao/impl/CompanyDaoImpl.java
	project/learning-spring/src/main/java/org/learning/spring/hello/model/Company.java
Merge branch 'master' of github.com:yaohuiwu/learning-java