bug fix
fix bugs
fix bugs
bug fix
update conf
add update for alert
add update for alert
add retry for engine executing task fail when agent is reconnecting
Merge pull request #69 from sunryuan/master

Done
Fix Merge Conflicts