Don't create functions inside loop
Merge branch 'crawler' into develop
Start redesign
Merge branch 'layout' into develop
Resolve merge conflict