Updated CGI Server IP
SAM Map Testing
Merge branch 'jon' of https://github.com/puruckertom/ubertool_eco into jon