Fixed several bugs on navset2 date
Merge pull request #35 from jacksontan/master

Fixed several bugs on navset2 date and cleaned some codes