add limit cpu and memory and fix lxc-wait ip
Merge remote-tracking branch 'origin/master'