Nicer setup, not as many for loops
Merge remote-tracking branch 'origin/master'

Conflicts:
	utils/urls.js