hero unit update
Merge branch 'develop'