Merge branch 'master' of https://github.com/holyful/spiderweb

Conflicts:
	spider/app.js
Merge remote-tracking branch 'origin/master'