Today Commit
Merge branch 'dev' of https://github.com/nishisan/NetcoolAutomation into dev

Conflicts:
	.svn/wc.db
	NetcoolAutomation-ejb/nbproject/project.properties
	NetcoolAutomation-ejb/src/java/com/linuxrouter/netcool/client/OmniClient.java
	NetcoolAutomation-ejb/src/java/com/linuxrouter/netcool/client/database/DbUtils.java
	NetcoolAutomation-ejb/src/java/com/linuxrouter/netcool/configuration/AutomationConstants.java
	NetcoolAutomation-ejb/src/java/com/linuxrouter/netcool/jobs/AutomationJob.java
	NetcoolAutomation-ejb/src/java/com/linuxrouter/netcool/jobs/ScriptJob.java
	NetcoolAutomation-ejb/src/java/com/linuxrouter/netcool/session/JobManagerBean.java