Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/uas/uas_mes_stw/fragment/IOCOutMakeMaterialOper.java
#	app/src/main/res/layout/fragment_iocout_make_material_oper.xml
#	app/src/main/res/layout/item_grid_first.xml

build.gradle

@@ -3,6 +3,10 @@
 
 buildscript {
     repositories {
+        maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' }
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/google' }
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/gradle-plugin' }
         maven { url "https://jitpack.io" }
         mavenCentral()
         google()