Merge branch 'test' into dev

@@ -209,6 +209,7 @@ func GetCompanyDefaultRole(companyid int64) (*Role, error) {
 	o := orm.NewOrm()
 	o := orm.NewOrm()
 	err := o.QueryTable(&Role{}).
 	err := o.QueryTable(&Role{}).
 		Filter("company_id", companyid).
 		Filter("company_id", companyid).
+		Filter("types", ROLETYPES_ROLE).
 		Filter("is_default", ROLE_DEFAULR).
 		Filter("is_default", ROLE_DEFAULR).
 		One(r)
 		One(r)
 	return r, err
 	return r, err