20140331
Merge chawachote/master
20140409
20140409
20140409
20140409
20140409
20140409
20140409
20140409
20140409
20140409
20140409
Merge chawachote/master

Conflicts:
	BotDmsFmApp/src/com/kcs/core/dao/CurrencyDao.java
	BotDmsFmApp/src/com/kcs/core/dao/ManageDao.java
	BotDmsFmApp/src/com/kcs/core/dao/impl/AuthorizeUserDaoImpl.java
	BotDmsFmApp/src/com/kcs/core/dao/impl/CurrencyDaoImpl.java
	BotDmsFmApp/src/com/kcs/core/dao/impl/ManageDaoImpl.java
	BotDmsFmApp/src/com/kcs/core/service/ManageService.java
	BotDmsFmApp/src/com/kcs/core/service/impl/ManageServiceImpl.java
	BotDmsFmWeb/src/java/ApplicationResource.properties
	BotDmsFmWeb/src/java/com/kcs/action/master/OfficeAction.java
	BotDmsFmWeb/src/java/com/kcs/core/actions/ManageMenuAction.java
	BotDmsFmWeb/web/jsp/management/menu/menu-form.jsp
	BotDmsFmWeb/web/jsp/management/menu/menu-list.jsp
Merge chawachote/master

Conflicts:
	BotDmsFmApp/src/com/kcs/core/dao/CurrencyDao.java
	BotDmsFmApp/src/com/kcs/core/dao/ManageDao.java
	BotDmsFmApp/src/com/kcs/core/dao/impl/AuthorizeUserDaoImpl.java
	BotDmsFmApp/src/com/kcs/core/dao/impl/CurrencyDaoImpl.java
	BotDmsFmApp/src/com/kcs/core/dao/impl/ManageDaoImpl.java
	BotDmsFmApp/src/com/kcs/core/service/ManageService.java
	BotDmsFmApp/src/com/kcs/core/service/impl/ManageServiceImpl.java
	BotDmsFmWeb/src/java/ApplicationResource.properties
	BotDmsFmWeb/src/java/com/kcs/action/master/OfficeAction.java
	BotDmsFmWeb/src/java/com/kcs/core/actions/ManageMenuAction.java
	BotDmsFmWeb/web/jsp/management/menu/menu-form.jsp
	BotDmsFmWeb/web/jsp/management/menu/menu-list.jsp
Merge chawachote/master

Conflicts:
	BotDmsFmWeb/src/java/ApplicationResource.properties
	BotDmsFmWeb/web/jsp/management/menu/menu-form.jsp
	BotDmsFmWeb/web/jsp/management/menu/menu-list.jsp
20140409
20140409
20140418
Merge chawachote/master