fixed bug in controller
Merge branch 'master' of github.com:xichuanglian/monitor_system