20140612 by Chawachote A.
20140612 by Chawachote A.
20140612 by Chawachote A.
20140612 by Chawachote A.
20140612 by Chawachote A.
Merge palm/master

Conflicts:
	BotDmsFmApp/src/com/kcs/dao/DatasetIrfDao.java
	BotDmsFmWeb/web/login.jsp
commit 20140818