fix camera display
remove un-track file
Merge branch 'develop'