update develop into travis target branch
update develop into travis target branch

warriorframework/warriorframework,warriorframework/warriorframework,warriorframework/warriorframework,warriorframework/warriorframework