2013-6-5 liulitang
Merge branch 'master' of https://github.com/bcw104/scada-webapp

Conflicts:
	src/main/webapp/WEB-INF/views/main/ssjcmain.jsp