Merge palm/master

Conflicts:
	BotDmsFmApp/src/com/kcs/core/utilities/DmsConstant.java