Move %W from 6.6001 to 17.6001
Fixed merge b/c of uploading a wrong file at the other end
Merge branch 'master' of github.com:shabiel/M-Web-Server
Merge branch 'master' of github.com:shabiel/M-Web-Server
Added a  in case a global isn't there