Merge branch 'master' into release_1.6.0

kevzlou7979 · kevzlou7979 · commit a082aff94f80 · 2016-08-19T04:38:05.000+08:00
# Conflicts:
#	gwt-material/pom.xml
#	gwt-material/src/main/java/gwt/material/design/client/ui/MaterialListBox.java
#	gwt-material/src/main/java/gwt/material/design/client/ui/MaterialSwitch.java
#	gwt-material/src/main/resources/gwt/material/design/public/css/overridecss.css
#	pom.xml
diff --git a/gwt-material/pom.xml b/gwt-material/pom.xml
@@ -52,4 +52,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
+</project>
diff --git a/gwt-material/src/main/java/gwt/material/design/client/ui/MaterialListBox.java b/gwt-material/src/main/java/gwt/material/design/client/ui/MaterialListBox.java
@@ -82,4 +82,4 @@ public void add(Option option) {
         getSelectElement().add(OptionElement.as(option.getElement()), null);
         values.add(option.getValue());
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -82,4 +82,4 @@ public void add(Option option) {`
`82`	`82`	`getSelectElement().add(OptionElement.as(option.getElement()), null);`
`83`	`83`	`values.add(option.getValue());`
`84`	`84`	`}`
`85`		`-}`
	`85`	`+}`