prepare 2.5-SNAPSHOT
Merge branch 'master' into dev
add native survey list