update deps
Ignore html files in public folder
Merge remote branch 'origin/develop'