Merge branch 'develop'
Merge branch 'develop'
Merge commit 'b452342b7cc3508752e71f4017a30e720538dd23'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
update XML
Merge branch 'master' into develop