20140827
20140827
20140827
Merge origin/master

Conflicts:
	BotDmsFmWeb/src/java/struts.xml
..
..
..
Merge origin/master

Conflicts:
	BotDmsFmApp/src/com/kcs/dao/impl/CTBWithFTSAllCurrDaoImpl.java
	BotDmsFmWeb/src/java/ApplicationResource.properties
Merge origin/master

Conflicts:
	BotDmsFmApp/src/com/kcs/dao/impl/CTBWithFTSAllCurrDaoImpl.java
	BotDmsFmWeb/src/java/ApplicationResource.properties