Syncing static files
Merge branch 'dev'