fix up a few merge conflicts from the big merge master->2.1.refactor that were overlooked

.gitignore

@@ -1,22 +1,4 @@
 build/build.number
-<<<<<<< HEAD
-build.number
-bin
-cloudstack-proprietary
-.lock-wscript
-artifacts
-.waf-*
-waf-*
-target
-override
-.metadata
-dist
-*~
-*.bak
-cloud-*.tar.bz2
-*.pyc
-build.number
-=======
 bin/
 cloudstack-proprietary/
 premium/
@@ -35,4 +17,3 @@ cloud-*.tar.bz2
 *.pyc
 build.number
 cloud.log.*.*
->>>>>>> master

ui/scripts/cloud.core.js

@@ -626,11 +626,7 @@ function noNull(val) {
 // Prevent cross-site-script(XSS) attack. 
 // used right before adding user input to the DOM tree. e.g. DOM_element.html(sanitizeXSS(user_input));  
 function sanitizeXSS(val) {     
-<<<<<<< HEAD
     if((val == null) || (typeof val != "string"))
-=======
-    if(val == null || typeof(val) != "string")
->>>>>>> master
         return val; 
     val = val.replace(/</g, "&lt;");  //replace < whose unicode is \u003c     
     val = val.replace(/>/g, "&gt;");  //replace > whose unicode is \u003e