Replace the actions in app.rb to crawler.rb
Solve the conflicts
Merge branch 'lee' into develop