Merge branch 'master' of https://github.com/mumuy/relationship

# Conflicts:
#	dist/relationship.min.js
#	dist/relationship.zh-HK.min.js

src/module/data/main.js

@@ -261,7 +261,7 @@ export default {
     'lb,w':['弟妹','弟媳','弟媳妇','弟媳妇子','弟新妇','老弟嫂'],
     'lb,s':['侄子','弟子'],
     'lb,d':['侄女','弟女'],
-    'xb,s':['侄子','侄男','嫡侄','侄儿','侄儿子','侄','侄仔','阿侄'],
+    'xb,s':['侄子','侄男','嫡侄','侄儿','侄儿子','侄','侄仔','阿侄','老侄'],
     'xb,s,w':['侄媳妇','侄媳','侄嫂','侄妇'],
     'xb,d':['侄女','侄囡','侄女儿','侄闺女'],
     'xb,d,h':['侄女婿','侄婿','侄郎'],

src/module/data/prefix.js

@@ -51,7 +51,7 @@ export default {
         'f,m,xb,s&l':['舅表叔'],
         'f,m,xs,s&o':['姨伯','从母伯','从伯'],
         'f,m,xs,s&l':['姨叔','从母叔','从叔'],
-        'm,f,xb,s':['堂舅','从父舅'],
+        'm,f,xb,s':['堂舅','从父舅','叔伯舅'],
         'm,f,xs,s':['姑表舅'],
         'm,m,xb,s':['舅表舅'],
         'm,m,xs,s':['姨舅','从母舅'],
@@ -70,7 +70,7 @@ export default {
         'f,f,xs,d':['姑表姑'],
         'f,m,xb,d':['舅表姑'],
         'f,m,xs,d':['姨姑','从母姑'],
-        'm,f,xb,d':['堂姨','从父姨'],
+        'm,f,xb,d':['堂姨','从父姨','叔伯姨'],
         'm,f,xs,d':['姑表姨'],
         'm,m,xb,d':['舅表姨'],
         'm,m,xs,d':['姨姨','从母姨'],
@@ -110,24 +110,24 @@ export default {
         'f,f,xb,s,w':['从父叔眷'],
         'f,f,xs,s,w':['姑表叔眷'],
         'f,m,xb,s,w':['舅表叔眷'],
-        'f,m,xs,s,w':['姨表叔眷'],
+        'f,m,xs,s,w':['从母叔眷'],
         'm,xb,w':['舅眷'],
         'm,f,xb,s,w':['从父舅眷'],
         'm,f,xs,s,w':['姑表舅眷'],
         'm,m,xb,s,w':['舅表舅眷'],
-        'm,m,xs,s,w':['姨表舅眷'],
+        'm,m,xs,s,w':['从母舅眷'],
     },
     '{M1M}':{
         'f,xs,h':['姑姻'],
         'f,f,xb,d,h':['从父姑姻'],
         'f,f,xs,d,h':['姑表姑姻'],
         'f,m,xb,d,h':['舅表姑姻'],
-        'f,m,xs,d,h':['姨表姑姻'],
+        'f,m,xs,d,h':['从母姑姻'],
         'm,xs,h':['姨姻'],
         'm,f,xb,d,h':['从父姨姻'],
         'm,f,xs,d,h':['姑表姨姻'],
         'm,m,xb,d,h':['舅表姨姻'],
-        'm,m,xs,d,h':['姨表姨姻'],
+        'm,m,xs,d,h':['从母姨姻'],
     },
     '{M0}':{
         'xb,w':['兄弟眷'],