Emergency fix
Merge branch 'master' of https://github.com/emmanuelbassil/NSS-Phoenix
Minor fixes.
Merge branch 'master' of https://github.com/jamiedigweed/NSS-Phoenix