Update static files
remove xscan
Merge branch 'develop'