Improved crawler
Merge branch 'master' into feature/improve-crawler

Conflicts:
	crawler.js
Fixed relauching delay