some bugs
yoland calc
Merge branch 'master' into for-yoland

Conflicts:
	db/src/main/java/com/usavich/db/common/dao/def/CommonDAO.java
	db/src/main/java/com/usavich/db/common/dao/impl/CommonDAOImpl.java
	db/src/main/java/com/usavich/db/common/dao/impl/CommonMapper.java
	db/src/main/resource/mappers/common/CommonMapper.xml
	service/src/main/java/com/usavich/service/common/def/CommonService.java

service/src/main/java/com/usavich/service/common/impl/CommonServiceImpl.
java
	web.app/web/yolandCalc.jsp