Fixed singu / Cleanbots and lots of machinery..

Please fix this ;-;
Merge branch 'master' of https://github.com/emmanuelbassil/NSS-Phoenix