better json input format....
Merge branch 'master' into navrevamp
exclude data files...