Merge branch 'master' of https://github.com/nemobis/jquery.uls into nemobis-master

Change-Id: I27589e099cf9841194c92228b8d91cee33937390

css/jquery.uls.css

@@ -69,16 +69,6 @@
 	border-bottom: none;
 }
 
-.uls-worldmap {
-	/* @embed */
-	background: transparent url('../images/world_map.png') no-repeat scroll right top;
-	/* @embed */
-	background-image: -webkit-linear-gradient(transparent, transparent), url('../images/world_map.svg');
-	/* @embed */
-	background-image: linear-gradient(transparent, transparent), url('../images/world_map.svg');
-	background-size: 100%;
-}
-
 div.uls-region {
 	cursor: pointer;
 	padding: 0;
@@ -89,11 +79,6 @@ div.uls-region {
 	border-bottom-width: 2px;
 }
 
-.uls-worldmap .uls-region { /* The map doesn't flip */
-	/* @noflip */
-	float: left;
-}
-
 .uls-region a {
 	bottom: 2px;
 	left: 2px;
@@ -115,6 +100,7 @@ div.uls-region {
 	-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#253366bb, endColorstr=#253366bb)";
 }
 
+<<<<<<< HEAD
 .uls-map-block .active {
 	border-bottom-color: #3366bb;
 	border-bottom-style: solid;