Merge pull request #151 from jamiedigweed/master

Update to current
Merge pull request #153 from jamiedigweed/master

Update to current
Merge pull request #155 from jamiedigweed/master

Update to current
Merge pull request #159 from jamiedigweed/master

Update to current
Security now gets access on code red, also fixes.
Merge pull request #160 from yashaldie/master

Server crashing fix
Merge pull request #162 from jamiedigweed/master

Update to current
Merge pull request #161 from jamiedigweed/Jamie

Fixes!
Missed these apparently
Merge branch 'Jamie' of https://github.com/emmanuelbassil/NSS-Phoenix into Jamie
Merge pull request #163 from jamiedigweed/Jamie

Update to current
Merge pull request #10 from jamiedigweed/master

master merge