20140328
20140328
Merge chawachote/master

Conflicts:
	BotDmsFmApp/src/com/kcs/dao/DfBirDao.java
	BotDmsFmApp/src/com/kcs/dao/DfIiaDao.java
	BotDmsFmApp/src/com/kcs/dao/impl/DfBirDaoImpl.java
	BotDmsFmApp/src/com/kcs/dao/impl/DfIiaDaoImpl.java
	BotDmsFmApp/src/com/kcs/service/DfBirService.java
	BotDmsFmApp/src/com/kcs/service/DfIiaService.java
	BotDmsFmApp/src/com/kcs/service/impl/DfBirServiceImpl.java
	BotDmsFmApp/src/com/kcs/service/impl/DfIiaServiceImpl.java
	BotDmsFmWeb/src/java/ApplicationResource.properties