fix eclipse build error
Merge branch 'develop'
clean test result