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