#17 Fixed - added IP check to set site url
Fix merge conflict in minified files
Add WM ip address to functions file and confirm with test