20140508 Merge palm/master

Conflicts:
	BotDmsFmApp/src/com/kcs/core/dao/impl/AuthorizeUserDaoImpl.java