Merge pull request #1 from jacksontan/master

Integration of navset2 to ddk 2 rc1